Commit Graph
751 Commits
Author SHA1 Message Date
Zach 745ba8dbaf Merge pull request #490 from bculkin2442/master
Fixed manuals
2014-02-21 07:34:55 -05:00
Alexander 903dfca8e0 Code Clean up 2014-02-20 15:35:34 -05:00
Alexander 2138681a8e Fix PacketStencilTable 2014-02-20 15:31:57 -05:00
Alexander 46fe013ccc Merge remote-tracking branch 'upstream/master' 2014-02-20 15:05:15 -05:00
Progwml6 5d8f03ce0d manually handle lava bucket b/c of forge issue 2014-02-20 15:03:12 -05:00
Progwml6 38dee74ac8 change API logger to log4j2 2014-02-20 14:20:02 -05:00
Progwml6 5c4d01f5d0 remove remnants of drawbridge registries.. have been moved to TMech 2014-02-20 12:40:03 -05:00
Alexander db764e4fa1 Fix Some of the rendering errors/Tree errors. 2014-02-19 21:44:45 -05:00
bculkin2442 54eb1d9405 Fixed Manuals
All of the manuals now show up when clicked.
2014-02-19 10:04:09 -05:00
Progwml6 e5882901e1 part one of moving books over fully to new mantle interfaces 2014-02-17 21:34:34 -05:00
Alexander 1bc13bad5b Fix getIcon for servers 2014-02-17 15:30:13 -05:00
Alexander 69c8fd81e1 Fix some NBT errors 2014-02-17 15:09:49 -05:00
Alexander 544536401b Fix some bugs with the way Gui's work. 2014-02-17 01:27:15 -05:00
Alexander 18a440b3c0 Remove non used items 2014-02-17 00:36:50 -05:00
Alexander 3d866316a7 Doing some code cleanup. 2014-02-17 00:31:43 -05:00
Alexander 038be9da2a Fix the Smeltery Again :D 2014-02-16 16:20:53 -05:00
Alexander 9afbf80a69 Fix Smeltery 2014-02-16 16:05:39 -05:00
Alexander 5d4e38c0cb Upload my Code Changes/Format/imports 2014-02-16 14:23:50 -05:00
Arthur Uzulin ac5dcee2db Fixed landmine behaviors
- TODO: Fix sync issues in landmines
2014-02-16 18:58:37 +11:00
Progwml6 20eafc2cd6 merge/ comment out some armor ticking code for now to prevent NPE's 2014-02-16 00:04:38 -05:00
Zach f6b6564895 Merge pull request #477 from Glassmaker/patch-3
Patch 3
2014-02-15 13:08:26 -05:00
Glassmaker da752a356c Made the hammer respect mining levels of the adjacent blocks 2014-02-15 21:03:19 +03:00
Progwml6 040d0515f6 restore facade support 2014-02-15 12:56:25 -05:00
Glassmaker b261bc4278 Fixed Harvest tools not breaking blocks not in effective list 2014-02-15 20:34:40 +03:00
Progwml6 c57abab274 remove debug prntlines 2014-02-15 11:02:30 -05:00
Arthur Uzulin e24b53a26e Fixed NPE when breaking blocks with undefined HarvestTool 2014-02-15 23:56:44 +11:00
Progwml6 87e687d4ad swap in some of the logic from the hammer to solve tool issue 2014-02-15 06:50:36 -05:00
Progwml6 5cf4dad45f use logger instead of sysout for skinloader errors 2014-02-15 06:19:33 -05:00
Arthur Uzulin 1f8d7693ef Nothing significant 2014-02-15 22:12:54 +11:00
Progwml6 9bb62789bc make hammer check tool type 2014-02-15 01:39:33 -05:00
Alexander 6574e331fc Fix Syncs 2014-02-15 00:29:24 -05:00
Zach ffd3234c5c Merge pull request #475 from alexbegt/master
Push everything i did.
2014-02-14 23:06:22 -05:00
Alexander 06ec60d1ee Push everything i did. 2014-02-14 23:05:41 -05:00
Progwml6 a8d8a568fa fix tools not checking harvest type on block breaking 2014-02-14 22:50:51 -05:00
Alexander e0a254fd3f All this needs to be tested, but here :P 2014-02-13 23:03:13 -05:00
Alexander 56d348dcc7 Enable Capes/Format Code 2014-02-11 21:35:05 -05:00
Clienthax b93edeaf5b Set non updatable for entities with no update method 2014-02-11 01:05:28 +00:00
Progwml6 86f8a2003f pull in some armor stuff from 1.6 2014-02-08 13:30:19 -05:00
TheVikingWarrior 49be115db0 Update ToolStationGui.java 2014-02-08 18:48:09 +01:00
TheVikingWarrior 9abf220dba Update StencilTableGui.java 2014-02-08 18:43:31 +01:00
TheVikingWarrior 1dd90b3417 Update GuiLandmine.java 2014-02-08 18:40:23 +01:00
Alexander 380e105d5c Fix Some More Format. 2014-02-07 17:11:03 -05:00
Alexander 0d2a8689cb Pushed wrong class. 2014-02-07 16:56:44 -05:00
Alexander f2871763ed Push my latest fixes to creative. 2014-02-07 16:50:54 -05:00
Flenix a166dafc7f Add FlenixCities Food support to Jerky
Very minor tweak. Simply changed it so that if FlenixCitiesFood is found, it'll do exactly the same thing it does if Hunger Overhaul is found.
2014-02-07 19:27:00 +00:00
Alexander 8898ddeb89 Fix ASM and name problems. 2014-02-06 20:17:52 -05:00
Progwml6 4b2fda2dfc dont reference mantle's copies of this 2014-02-06 19:23:40 -05:00
Progwml6 bde810c56b don't reference mantle's copy of the names 2014-02-06 19:21:34 -05:00
Alexander 7462ebd85b Make Smeltery Update, Just no recipes yet. 2014-02-06 18:15:36 -05:00
Alexander 2a2f84ee88 Format code again + organize imports 2014-02-05 10:28:54 -05:00