Commit Graph
213 Commits
Author SHA1 Message Date
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
Alexander a83e9a3b53 Fix all errors. 2014-02-05 10:22:35 -05:00
Progwml6 ffaea7d4b7 run repo through formatter 2014-02-05 09:11:06 -05:00
Progwml6 5585d680a3 some fixes 2014-02-05 08:59:16 -05:00
Progwml6 b8cf7cdc5e run through remap script 2014-02-05 08:28:53 -05:00
Progwml6 689aeba09b some more fixes from 1.6.x 2014-02-04 21:21:50 -05:00
Progwml6 9fce66a827 port in some fixes from 1.6.x 2014-02-04 20:40:58 -05:00
Alexander c1a92807cd Add my changes, Client runs, I broke Smeltery ATM, Needs to be fixed :) 2014-02-04 18:00:13 -05:00
Progwml6 57b6f72c2b starting to port in 1.6.x fixes 2014-02-04 17:47:30 -05:00
Alexander 67faf8aa79 Work on fixing Landmine, needs to be tested 2014-02-03 14:42:37 -05:00
Alexander fffe2800bd Fix the errors that were left, I commeneted our some code in SmelteryLogic for right now, Also changed the way ArrowEntity Sends the ChangeGameState 2014-02-03 10:02:49 -05:00
Progwml6 840e0cee04 17 errors left 2014-02-03 04:28:45 -05:00
Progwml6 0fe91c2d7a 35 errors left 2014-02-02 23:18:57 -05:00
Alexander b70ed14631 Fix some bugs :). 2014-02-02 22:36:22 -05:00
Progwml6 f6ba851886 fix a few things 2014-02-02 12:14:42 -05:00
Progwml6 a8c1f32650 less than 100 to go 2014-02-02 12:06:48 -05:00
Progwml6 f936434c71 getting super close 2014-02-02 11:35:00 -05:00
Progwml6 625d319b0c fix moar things 2014-02-02 11:02:52 -05:00
Progwml6 e3282b14db time to take a break for a few hours 2014-02-01 16:14:23 -05:00
Progwml6 5aec324ece even closer 2014-02-01 16:06:02 -05:00