Commit Graph
1649 Commits
Author SHA1 Message Date
Zach ca4dfc60e2 Merge pull request #529 from Vexatos/patch-2
Update de_DE.lang
2014-03-12 20:54:03 -04:00
Vexatos 89a3f6659f Update de_DE.lang 2014-03-12 11:06:15 +01:00
Zach 21c851a6f9 Merge pull request #524 from wodkashorty/patch-1
Update de_DE.lang
2014-03-12 06:02:38 -04:00
Zach f7870e71fc Merge pull request #518 from darknesswind/patch-1
Update zh_CN.lang
2014-03-12 05:56:36 -04:00
wodkashorty d56ead0c17 Merge pull request #1 from wodkashorty/patch-2
Update de_DE.lang

Few typo fixes
2014-03-12 02:16:17 +01:00
wodkashorty ffd03827e4 Update de_DE.lang
Few typo fixes
2014-03-12 02:15:30 +01:00
Progwml6 2d70dab874 add AT entry for tesselator.isDrawing for a depending mod 2014-03-11 15:30:54 -04:00
wodkashorty 9e2706c26f Update de_DE.lang 2014-03-10 03:43:21 +01:00
Zach 77b31c56e2 Merge pull request #522 from TheVikingWarrior/patch-5
Update CraftingStationGui.java
2014-03-09 14:37:29 -04:00
TheVikingWarrior 0683e1fe2d Update CraftingStationGui.java 2014-03-09 19:18:34 +01:00
Zach a0080e70fb add jade and myrathi to capes list 2014-03-09 01:44:06 -05:00
Progwml6 6046c24e2d send the description packet from the server as this is a server sided method 2014-03-08 20:01:59 -05:00
Progwml6 24003e588a fix for networking related method not found on server in smeltery logic 2014-03-08 18:51:19 -05:00
darknesswind cdbb4d3455 Update zh_CN.lang 2014-03-08 19:52:53 +08:00
Zach 9d5fc07c04 fix NPE in armorextended 2014-03-07 16:09:24 -05:00
mDiyo ad67a78845 Patron capes, temporary 2014-03-07 12:45:06 -08:00
Zach ebc62c8107 Merge pull request #516 from portablejim/inventoryFixes
Make TPlayerStats an IExtendedEntityProperties + associated changes
2014-03-06 16:26:23 -05:00
James McKay 244428928c Make TPlayerStats an IExtendedEntityProperties + associated changes
Inventory + Knapsack inventory (and whether you have the manual) is now synced
whenever the player data is (e.g. on disconnect, on changing dimensions and
when going into the menu in SSP.

Other changes:
 * Remove Armor sync packet as it's not needed anymore
 * Move dropping of inventory and knapsack items from TEventHandler to
     TPlayerHandler. Changes to drop items will all other inventory items.
 * Make playerstats store in TPlayerHandler and make it use player UUIDs
     instead of player names (for compatibility with 1.7.6+)
 * Don't sync inventory manually on logging off / changing dimension
     (it's unneeded)
2014-03-06 22:33:35 +11:00
Progwml6 cc2aeb82e0 remove battle gear 2 compat as its impossible to support mods w/ constantly changing API's 2014-03-06 02:08:35 -05:00
Zach cb43dca6dc Merge pull request #511 from TheVikingWarrior/patch-8
Update it_IT.lang
2014-03-03 17:10:59 -05:00
Progwml6 3def2da628 send Fluid ID packet should solve crash when clicking on fluid in smeltery gui 2014-03-03 16:58:38 -05:00
TheVikingWarrior bfcdc2eacd Update it_IT.lang 2014-03-03 14:48:23 +01:00
Progwml6 5b81260b05 make sure that empty hand's don't cause NPE's in the even handler 2014-03-01 21:44:33 -05:00
Progwml6 9b4b59adbd update to use mantle's texture domain for inventory blocks
WARNING: USERS MUST!!! update mantle to use this build
2014-02-27 15:27:44 -05:00
Zach 7b8483e60d Merge pull request #503 from portablejim/armourGuiOpen2
Fix opening of GUIs (with client/server sync) and fix Knapsack gui.
2014-02-26 11:52:55 -05:00
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
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