summaryrefslogtreecommitdiffstats
path: root/MCServer/items.ini (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Re-added alternate spellings of darkgraywool.madmaxoft2014-09-021-0/+2
|
* Merge branch 'master' into blocksMasy982014-09-011-0/+1
|\ | | | | | | | | | | Conflicts: MCServer/furnace.txt MCServer/items.ini
| * Rewrited furnace.txtHowaner2014-08-311-0/+1
| |
* | Fixed spacing and light gray wool name!Masy982014-09-011-0/+2
| |
* | Added furnace recipes!Masy982014-08-311-1/+1
| |
* | Added 1.8 recipes!Masy982014-08-311-4/+18
| |
* | Added 1.8 blocks and items!Masy982014-08-311-1/+65
|/
* Fixed missing slab name in line 297Masy982014-08-301-1/+1
|
* Fixed slab nameMasy982014-08-211-1/+1
|
* Added missing recipes for stairs and slabs!Masy982014-08-211-0/+1
|
* Changed new logs from wood to log!Masy982014-08-211-4/+4
|
* Added missing blocks in item.iniMasy982014-08-211-2/+49
|
* Added air, farmland and tilleddirt to items.ini.madmaxoft2014-02-091-0/+3
| | | | Air hasn't been present at all, the others are usual synonyms.
* Merge branch 'master' of git://github.com/nesco/MCServer.madmaxoft2013-11-191-3/+11
|\
| * flower=38nesco2013-11-181-4/+2
| |
| * Update items.ininesco2013-11-151-1/+15
| |
* | Re-added rose to items.ini.madmaxoft2013-11-151-1/+5
|/
* Update items.ininesco2013-11-131-1/+1
|
* Update items.ininesco2013-11-131-3/+59
|
* Fixed new crafting recipes.tonibm192013-08-131-1/+7
| | | I forgot to change items.ini in my latest merged PR, sorry for that
* Changed everyting to Unix line endings.Alexander Harkness2013-07-291-543/+543
|
* Added missing crafting recipes.nielsbreu@gmail.com2013-04-011-0/+5
| | | | | | 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
* Block and recipe update by STR_Warrior.madmaxoft2013-02-151-1/+19
| | | | | | | | | 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
* Added 1.4.6 items (patch contributed by STR_Warrior)madmaxoft@gmail.com2012-12-241-0/+3
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1101 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added Netherbrick slab (patch contributed by STR_Warrior)madmaxoft@gmail.com2012-12-221-0/+1
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1098 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Updated crafting and items to 1.4.4 (initial patch by STR_Warrior)madmaxoft@gmail.com2012-11-171-1/+34
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1051 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Biomal CompoGen now generates sea with STATIONARY_WATER instead of regular WATER.madmaxoft@gmail.com2012-10-141-0/+2
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@962 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Crafting recipes for 1.3.2 (patch submitted by STR_Warrior)madmaxoft@gmail.com2012-09-291-0/+10
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@903 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Moved files used by MCServer to a special MCServer folderfaketruth2012-08-201-0/+471
git-svn-id: http://mc-server.googlecode.com/svn/trunk@763 0a769ca7-a7f5-676a-18bf-c427514a06d6