248 Commits

Author SHA1 Message Date
Toby plowy
11f6058475 stuff 2017-02-14 21:04:43 +01:00
D00Med
c60314b727 something stuffed up 2017-02-13 16:36:00 +10:00
D00Med
5f27e83af4 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	mods/decoblocks/nodes.lua
#	mods/decoblocks/textures/decoblocks_bamboo.png
#	mods/decoblocks/textures/decoblocks_bamboo_top.png
2017-02-13 16:35:15 +10:00
D00Med
0a6b61caac bamboo stuff 2017-02-13 16:29:16 +10:00
Toby plowy
79f1137fdc Merge pull request #76 from D00Med/tobys-stuff
texture edits
2017-02-13 04:15:57 +01:00
Toby plowy
607804d57a texture edits 2017-02-13 04:15:27 +01:00
D00Med
0ef506e472 bamboo chest 2017-02-13 11:20:54 +10:00
D00Med
4685bf6b94 bamboo door 2017-02-13 11:14:39 +10:00
D00Med
617b4d712c remove mesa biome 2017-02-13 11:07:12 +10:00
D00Med
042ea24d90 baobab trees 2017-02-13 11:01:57 +10:00
D00Med
6ed2182258 I have a goldfish brain 2017-02-13 10:33:32 +10:00
D00Med
7492d28021 better bamboo biome 2017-02-13 10:31:43 +10:00
D00Med
73ef5c9403 bamboo forest 2017-02-13 08:28:22 +10:00
D00Med
792b062be8 flowers 2017-02-13 07:35:58 +10:00
D00Med
3bad207106 biome stuff 2017-02-13 07:18:30 +10:00
Toby plowy
60bf350ebc Merge pull request #75 from D00Med/tobys-stuff
bamboo forest grass
2017-02-12 22:07:30 +01:00
Toby plowy
ceaf1fe180 bamboo forest grass 2017-02-12 22:07:02 +01:00
D00Med
f9774ad93f conifer forests back to normal 2017-02-13 06:17:24 +10:00
Toby plowy
9c95944d46 Merge pull request #74 from D00Med/tobys-stuff
some stuff
2017-02-12 02:48:25 +01:00
Toby plowy
5e92e4bd0f some stuff 2017-02-12 02:47:50 +01:00
D00Med
f7bec3e7fa some bamboo things 2017-02-12 11:11:43 +10:00
D00Med
a3431c9f3c Steam 2017-02-12 11:00:01 +10:00
D00Med
9e9e119d7a a lot of tool textures 2017-02-12 10:42:02 +10:00
D00Med
ab66e0f9bf bigstone sword 2017-02-12 10:33:01 +10:00
Toby plowy
4e6887e223 bamboo 2017-02-12 01:12:26 +01:00
D00Med
e1c1e9c7c6 fencefix 2017-02-12 10:01:33 +10:00
D00Med
dde4eb4581 bamboo fence 2017-02-12 09:43:58 +10:00
D00Med
c5f39a702e chest texture 2017-02-12 07:36:36 +10:00
D00Med
5287a09229 furnace texture and fix 2017-02-12 07:30:19 +10:00
Toby plowy
ac9b5adb1c Merge pull request #73 from D00Med/tobys-stuff
ores and stuff
2017-02-11 21:41:07 +01:00
Toby plowy
ff060694c9 ores and stuff 2017-02-11 21:40:16 +01:00
Toby plowy
1a69d58f23 tin ore 2017-02-11 02:39:38 +01:00
D00Med
426c97ba94 oats 2017-02-11 10:12:19 +10:00
D00Med
4a3ec59123 furnace and tin 2017-02-11 10:03:56 +10:00
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