614 Commits

Author SHA1 Message Date
Toby plowy
d80b939031 oat 2017-02-11 00:45:26 +01:00
D00Med
24a129ca18 pineapple generation 2017-02-11 08:49:28 +10:00
D00Med
04aa37ff69 pineapple 2017-02-11 08:46:44 +10:00
D00Med
f6a49103e7 fix post effect color in water 2017-02-11 08:31:58 +10:00
D00Med
5ea8129ca3 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	mods/mapgen/nodes.lua
2017-02-11 08:26:51 +10:00
D00Med
90ed3472ba mapgen 2017-02-11 08:25:38 +10:00
Toby plowy
d465754f0f lolol 2017-02-10 19:46:20 +01:00
D00Med
d6b09f3aac improvements 2017-02-10 07:40:43 +10:00
D00Med
fdcceac42d sea mapgen 2017-02-10 07:33:08 +10:00
D00Med
2596b3af04 fix 2017-02-10 06:49:03 +10:00
D00Med
f17d751490 Merge pull request #72 from D00Med/tobys-stuff
i hate programming!!!
2017-02-10 06:43:46 +10:00
Toby plowy
b14e5355ab i hate programming!!! 2017-02-09 21:41:45 +01:00
Toby plowy
526286aca1 Merge pull request #71 from D00Med/tobys-stuff
oat
2017-02-09 18:14:56 +01:00
Toby plowy
f4cea7e049 oat 2017-02-09 18:12:36 +01:00
D00Med
a9fbddd940 savanna stone 2017-02-09 07:04:47 +10:00
D00Med
b651370a5d ocean plants 2017-02-09 06:57:35 +10:00
Toby plowy
dc9b4d45a6 Merge pull request #70 from D00Med/tobys-stuff
crops rot
2017-02-08 08:36:14 +01:00
Toby plowy
25d1bf5ecd crops rot 2017-02-08 08:35:40 +01:00
D00Med
0c43df23e9 Farming 2017-02-08 07:03:51 +10:00
D00Med
d6d1fe9a69 carrot test 2017-02-08 07:03:51 +10:00
Toby plowy
4a673b930a Merge pull request #69 from D00Med/tobys-stuff
lol stand
2017-02-06 20:08:55 +01:00
Toby plowy
fa5f451c52 lol stand 2017-02-06 20:07:18 +01:00
Toby plowy
0bca7dfa98 Merge pull request #68 from D00Med/tobys-stuff
coral stuff (temp)
2017-02-06 04:44:59 +01:00
Toby plowy
3c467ff9e5 coral stuff 2017-02-06 04:44:13 +01:00
D00Med
29dff7a914 bed fixes 2017-02-06 13:12:37 +10:00
D00Med
90115eb2cf farming stuff 2017-02-06 12:45:37 +10:00
D00Med
da030988d6 skins and attempted bed fix 2017-02-06 10:28:59 +10:00
D00Med
ab2891cc1b works with all beds 2017-02-05 10:25:01 +10:00
D00Med
61647395e5 colored beds 2017-02-05 09:13:38 +10:00
D00Med
cd4c0f9abc colored beds 2017-02-05 08:27:23 +10:00
D00Med
2ad8c310fd doompick renamed to superpick 2017-02-05 06:37:22 +10:00
Toby plowy
a7cb187f0f Merge pull request #67 from D00Med/tobys-stuff
bed
2017-02-04 15:38:48 +01:00
Toby plowy
382d082b46 bed 2017-02-04 15:38:06 +01:00
Toby plowy
c0c2842ac6 Merge pull request #66 from D00Med/tobys-stuff
bed size fix
2017-02-04 15:27:07 +01:00
Toby plowy
138e25e26e bed size fix 2017-02-04 15:26:29 +01:00
Toby plowy
492f5abd0e Merge pull request #65 from D00Med/tobys-stuff
iron
2017-02-04 15:13:01 +01:00
Toby plowy
a794b8617f iron 2017-02-04 15:07:10 +01:00
D00Med
c040dc74c6 bed 2017-02-04 14:42:08 +10:00
Toby plowy
ed2d9a4e85 Merge pull request #64 from D00Med/tobys-stuff
logos
2017-02-04 04:43:03 +01:00
Toby plowy
06659b8842 logos 2017-02-04 04:42:22 +01:00
Toby plowy
ef9ec8ccc2 logos 2017-02-04 04:40:35 +01:00
Toby plowy
f9c252acdf Merge pull request #63 from D00Med/tobys-stuff
wool
2017-02-04 03:17:52 +01:00
Toby plowy
a49c4e713d wool 2017-02-04 03:17:25 +01:00
Toby plowy
35aaeec819 Merge pull request #62 from D00Med/tobys-stuff
wood frame window
2017-02-04 01:03:51 +01:00
Toby plowy
c6a7bbb0ac wood frame window 2017-02-04 01:03:00 +01:00
D00Med
47463b5910 swamp lurker 2017-02-04 09:46:10 +10:00
D00Med
a11e41bd75 pirana 2017-02-04 07:29:42 +10:00
D00Med
6160d7c9bd The word 2017-02-04 07:14:37 +10:00
D00Med
450a13dd52 a name change 2017-02-04 07:05:40 +10:00
Toby plowy
37d6507b52 Merge pull request #61 from D00Med/tobys-stuff
zombie flesh
2017-02-03 03:26:23 +01:00