Commit Graph
2423 Commits
Author SHA1 Message Date
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
Zach 548c12dc22 Merge pull request #501 from portablejim/armourGuiOpen
Fix opening and placement of armour GUI
2014-02-26 00:24:50 -05:00
James McKay 5f80e026c9 Fix opening and placement of armour GUI 2014-02-26 16:21:16 +11:00
Zach 66ce0e8a0c Merge pull request #500 from portablejim/keybindCrashFix
Fix crash when going into Controls
2014-02-25 20:35:31 -05: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
mDiyo 58bf2934be Add colored heart sprites 2014-02-25 12:04:01 -08: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
Zach be75ae6bd5 Merge pull request #499 from Cisien/patch-3
BC Facades update.
2014-02-23 19:09:05 -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 36bae9bd81 environment keystore pass overrides buildscript 2014-02-23 02:04:59 -05:00
Progwml6 31760e877a switch dep for sftp, fix the issue w/ jar signing on linux 2014-02-23 02:01:25 -05:00
Progwml6 7ba9277b38 add missing comma to signing stuffs 2014-02-23 01:42:18 -05:00
Progwml6 f58796bd4c feed in key pass to appease linux 2014-02-23 01:40:35 -05:00
Progwml6 37ba5fe41a try to debug signing acting up 2014-02-23 01:06:56 -05:00
Progwml6 f3600acbb9 log location of jar that's being signed 2014-02-23 00:59:35 -05:00
Progwml6 beab1ad274 more work on remote deploy stuff 2014-02-23 00:54:47 -05:00
Progwml6 2d5dc63f0f try to fix remote deploy error 2014-02-23 00:49:31 -05:00
Progwml6 4079c0ddbe update gradle stuffs in prep for deploying up to tanis 2014-02-23 00:40:58 -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
Zach 9874908e97 Merge pull request #493 from bculkin2442/master
Fixing of various bugs
2014-02-21 10:17:40 -05: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
Zach 745ba8dbaf Merge pull request #490 from bculkin2442/master
Fixed manuals
2014-02-21 07:34:55 -05:00
bculkin2442 4268f5afa0 Added some things to .gitignore
Git ignore should now ignore minecraft related files
2014-02-21 07:29:34 -05:00
Zach 3453714733 Merge pull request #488 from alexbegt/master
Fix some more bugs.
2014-02-20 15:41:32 -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