Commit Graph
251 Commits
Author SHA1 Message Date
James McKay fdbe852dc3 Cleanup imports 2014-02-26 22:48:47 +11:00
James McKay 809f0657e7 Fix placement of Knapsack gui. 2014-02-26 22:42:09 +11:00
James McKay 66da232f34 Fix GUI opening properly and get client/server sync.
Currently doesn't save extended armor and backpack on disconnect due to MinecraftForge/FML#381
2014-02-26 22:40:22 +11:00
James McKay 5f80e026c9 Fix opening and placement of armour GUI 2014-02-26 16:21:16 +11:00
James McKay 1e691f6505 Place a keybind into a new category.
Also add a new category en_US lang entry.
2014-02-26 12:25:01 +11:00
Progwml6 f2d4b48a98 partial fix for sided issues w/ armor synch packets 2014-02-25 20:23:00 -05:00
Progwml6 d6372a79ae pull in extra heart stuffs from 1.6 warning: probably will fail serverside 2014-02-25 19:48:18 -05:00
Progwml6 92a813e6ca pull in new logic from 1.6 for casting channels should solve class cast error from forum 2014-02-25 14:33:56 -05:00
Progwml6 e227f23e75 Merge branch 'master' of github.com:SlimeKnights/TinkersConstruct 2014-02-24 16:38:08 -05:00
Progwml6 5d06206029 fix derp w/ furnace recipes 2014-02-24 16:36:08 -05:00
Chris e45f97f455 BC Facades update.
Buildcraft 5.0.x will auto-detect normal blocks and add facades for them, so removing blocks that buildcraft won't accept anyway.
Fixes the ItemStack sent to BC so the meta is incremented, and not the stack size.
2014-02-23 15:43:08 -08:00
Progwml6 977db5299d icons for books should be stored in mantle not tcon 2014-02-23 15:36:32 -05:00
Progwml6 e126096c1a use cisien's implementation of fix method isnt needs serverside 2014-02-22 20:45:25 -05:00
Zach 9a61de0941 Merge pull request #496 from Cisien/patch-2
Additional null check on stats.armor
2014-02-22 19:48:56 -05:00
Progwml6 96dcde4483 fix for server sided crash reported on forum 2014-02-22 19:38:26 -05:00
Chris 5d78b96352 Additional null check on stats.armor 2014-02-22 14:17:26 -08:00
bculkin2442 2b5e0e4b3b Partially fixed detailing 2014-02-21 10:01:59 -05:00
bculkin2442 fa0644d4ae Re-adding some stuff from 1.6.4 2014-02-21 09:25:00 -05:00
bculkin2442 f217267601 Fixed more misc. bugs 2014-02-21 08:41:30 -05:00
bculkin2442 edc97ef256 Scythe fixed
The scythe should be working correctly now, or at least it works on
vanilla plants.
2014-02-21 07:55:10 -05:00
Alexander 30ea9db349 Code Clean up 2014-02-21 07:55:09 -05:00
Alexander 517c841d5c Fix PacketStencilTable 2014-02-21 07:55:08 -05:00
Progwml6 bc19758fee manually handle lava bucket b/c of forge issue 2014-02-21 07:55:07 -05:00
Progwml6 d470384975 change API logger to log4j2 2014-02-21 07:55:07 -05:00
Progwml6 eec14481c7 remove remnants of drawbridge registries.. have been moved to TMech 2014-02-21 07:55:06 -05:00
Alexander 4dca16cc0f Fix Some of the rendering errors/Tree errors. 2014-02-21 07:55:05 -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