1
0
Commit Graph

29 Commits

Author SHA1 Message Date
madmaxoft
4837d41368 Re-added alternate spellings of darkgraywool. 2014-09-02 08:35:58 +02:00
Masy98
cc9acd13b9 Merge branch 'master' into blocks
Conflicts:
	MCServer/furnace.txt
	MCServer/items.ini
2014-09-01 21:30:45 +02:00
Masy98
9674224e32 Fixed spacing and light gray wool name! 2014-09-01 19:08:29 +02:00
Howaner
3d7b8d3598 Rewrited furnace.txt 2014-08-31 19:28:36 +02:00
Masy98
90d39fd917 Added furnace recipes! 2014-08-31 16:50:05 +02:00
Masy98
b13f10aabf Added 1.8 recipes! 2014-08-31 16:25:12 +02:00
Masy98
9ee5229833 Added 1.8 blocks and items! 2014-08-31 15:28:01 +02:00
Masy98
55907376d5 Fixed missing slab name in line 297 2014-08-30 21:36:20 +02:00
Masy98
f71c76cf05 Fixed slab name 2014-08-21 22:13:12 +02:00
Masy98
940304bc64 Added missing recipes for stairs and slabs! 2014-08-21 22:08:34 +02:00
Masy98
81492f70d1 Changed new logs from wood to log! 2014-08-21 21:41:43 +02:00
Masy98
f569826a95 Added missing blocks in item.ini 2014-08-21 21:38:50 +02:00
madmaxoft
9795bfcbe3 Added air, farmland and tilleddirt to items.ini.
Air hasn't been present at all, the others are usual synonyms.
2014-02-09 16:19:38 +01:00
madmaxoft
7567f19052 Merge branch 'master' of git://github.com/nesco/MCServer. 2013-11-19 10:01:25 +01:00
nesco
44385fba28 flower=38 2013-11-18 16:55:30 +01:00
nesco
d3269f37fa Update items.ini 2013-11-15 14:18:53 +01:00
madmaxoft
9048a3b66d Re-added rose to items.ini. 2013-11-15 09:56:07 +01:00
nesco
b377072312 Update items.ini 2013-11-13 20:43:31 +01:00
nesco
69d711b407 Update items.ini 2013-11-13 20:43:24 +01:00
tonibm19
87fdeae583 Fixed new crafting recipes.
I forgot to change items.ini in my latest merged PR, sorry for that
2013-08-13 21:40:31 +02:00
Alexander Harkness
53e22b1185 Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
nielsbreu@gmail.com
bbb8fdf21a Added missing crafting recipes.
Quartz Slabs, Chiseled Quartz Block and Pillar Quartz Block

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1343 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-04-01 10:39:40 +00:00
madmaxoft
666a718db1 Block and recipe update by STR_Warrior.
Adds missing fuels
Adds missing furnace recipes (FS #304)
Fixes some recipes (FS #305)
Adds current 1.5 weekly snapshot blocks and items.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1215 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-02-15 15:26:33 +00:00
madmaxoft@gmail.com
641c7f868c Added 1.4.6 items (patch contributed by STR_Warrior)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1101 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-12-24 22:28:48 +00:00
madmaxoft@gmail.com
a31d55c8fc Added Netherbrick slab (patch contributed by STR_Warrior)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1098 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-12-22 14:17:14 +00:00
madmaxoft@gmail.com
18b73e471f Updated crafting and items to 1.4.4 (initial patch by STR_Warrior)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1051 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-11-17 09:27:27 +00:00
madmaxoft@gmail.com
dd554175a4 Biomal CompoGen now generates sea with STATIONARY_WATER instead of regular WATER.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@962 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-14 17:05:00 +00:00
madmaxoft@gmail.com
0598fbba0c Crafting recipes for 1.3.2 (patch submitted by STR_Warrior)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@903 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-29 14:51:51 +00:00
faketruth
12906c026d Moved files used by MCServer to a special MCServer folder
git-svn-id: http://mc-server.googlecode.com/svn/trunk@763 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-20 12:20:20 +00:00