Commit Graph
125 Commits
Author SHA1 Message Date
mDiyo 145f7b9724 Fix merge conflicts 2014-06-30 09:22:30 -08:00
Alexander Behrhof caf084edca Updating to 1.7.10_pre4 2014-06-25 21:01:20 -04:00
mDiyo 5a87c102ea Split more files into parts 2014-06-06 19:46:05 -08:00
mDiyo e2f0558b6f Reorganize folders for modules 2014-06-04 21:44:48 -08:00
Alexander Behrhof 2c14f315de Remove what prog moved into Mantle, Bump Forge Version 2014-06-01 21:20:12 -04:00
mDiyo c27f1932bc Merge pull request #655 from blue42u/patch-forge-gui
Fix the Tool Forge Gui!
2014-05-31 08:38:48 -07:00
blue42u 625f42f05c Fix them tabs! 2014-05-16 07:22:45 -05:00
blue42u fc2fdff25b Fix the Tool Forge Gui! 2014-05-14 09:52:04 -05:00
Progwml6 546cc2198e bump forge/mantle versions, restore waila integration 2014-05-10 16:50:27 -04:00
TheVikingWarrior 41679e4515 Update SmelteryGui.java 2014-04-16 18:02:27 +02:00
mDiyo ca417349b6 Remove unnecessary access transforming 2014-04-12 04:14:00 -08:00
Alexander b6ba8700ad Fix some bugs, and format code (Commented out woolslabs for now) 2014-04-03 22:28:37 -04:00
Alexander 42a5af5566 Fix some bugs,and add diyos BattleSigns 2014-04-02 20:38:48 -04:00
Progwml6 66a4ece284 port in everything from 1.6 but labotimizetools(will do that later this weekend) 2014-03-15 07:11:06 -04:00
TheVikingWarrior 0683e1fe2d Update CraftingStationGui.java 2014-03-09 19:18:34 +01: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
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 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
Alexander 903dfca8e0 Code Clean up 2014-02-20 15:35:34 -05:00
Alexander 46fe013ccc Merge remote-tracking branch 'upstream/master' 2014-02-20 15:05:15 -05:00
Alexander db764e4fa1 Fix Some of the rendering errors/Tree errors. 2014-02-19 21:44:45 -05:00
Progwml6 e5882901e1 part one of moving books over fully to new mantle interfaces 2014-02-17 21:34:34 -05:00
Alexander 544536401b Fix some bugs with the way Gui's work. 2014-02-17 01:27:15 -05:00
Alexander 3d866316a7 Doing some code cleanup. 2014-02-17 00:31:43 -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 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
Alexander 6574e331fc Fix Syncs 2014-02-15 00:29:24 -05:00
Alexander 06ec60d1ee Push everything i did. 2014-02-14 23:05:41 -05:00
Alexander 56d348dcc7 Enable Capes/Format Code 2014-02-11 21:35:05 -05: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 2a2f84ee88 Format code again + organize imports 2014-02-05 10:28:54 -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
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
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