Commit Graph
31 Commits
Author SHA1 Message Date
aidancbrady a89b8f666c <200 errors. All I have left is a bit of rendering work and the new "off hand" stuff 2016-05-25 17:30:22 -04:00
aidancbrady 374cc57515 Use new GlStateManager methods, got armor models to render (though the transformations seriously need to be updated) 2016-05-10 22:24:37 -04:00
Ben Spiers 0cb18773aa Merge branch 'development' into 1.8.9 2016-04-25 16:08:06 +01:00
aidancbrady f904c8b80c Start integrating security into all machinery. This is a very rough implementation, there's gonna be a lot of balance and corrections to make before release 2016-03-21 16:53:29 -04:00
Ben Spiers 84336ec4d1 Merge branch 'development' into 1.8.9
Huge merge with 202 conflicts, hopefully not *too* broken.
2016-03-18 04:24:19 +00:00
aidancbrady 87438dcc7f Boiler work, added heat info tab, worked on polishing heat interactions among machines 2016-02-27 13:32:48 -05:00
Ben Spiers bc024b851f GUIs are back! 2016-02-02 00:16:22 +00:00
Ben Spiers dedc84605f getInventoryName() -> getName() 2016-01-23 14:24:42 +00:00
Ben Spiers 9b8d9d92d6 Start update to 1.8.9
Fix all references to cpw.mods.fml namespace
2016-01-14 19:22:48 +00:00
aidancbrady 9ffc1bdff3 Localization fixes, part 1 2015-05-10 19:04:42 -04:00
Aidan C. Brady c85bdcd8ab Entity Detection mode for Laser Amplifier 2015-03-30 20:18:08 -04:00
Aidan C. Brady 0c9fd9364e Fixed usage displays of certain machinery 2015-03-29 00:42:40 -04:00
Aidan C. Brady e47f6032c1 Localization fixes 2015-03-24 11:39:25 -04:00
Aidan C. Brady a6e8fc8de0 Energy usage calculations are now much more efficient 2015-03-19 17:36:43 -04:00
Aidan C. Brady 3b96fe4a4c Fixed Digital Miner, fixed energy upgrades not affecting usage of Chemical Washers/Electrolytic Separators/Chemical Infusers/Rotary Condensentrators, added "dump excess" to electrolytic separator 2015-03-19 17:22:31 -04:00
Aidan C. Brady 5e5975bc58 Work on new teleporter system - still a lot to do 2015-03-11 10:58:15 -05:00
Aidan C. Brady 3f41027325 Started work on the new configuration interfaces, separated the transporter configuration from general side configuration, reorganized GUI elements into their own package 2015-03-07 21:08:28 -05:00
Aidan C. Brady c39e3d1c1f More dropper work 2015-02-26 20:50:02 -05:00
Aidan C. Brady 5767bfb22e Work on Solar Neutron Activator and its recipe system 2015-02-26 17:23:53 -05:00
Aidan C. Brady 98d1a647cb Rename Salination Plant to Solar Evaporation Plant 2015-02-23 08:08:54 -05:00
Aidan C. Brady cde5755ee3 Fixed an import 2014-09-27 14:09:13 -04:00
Aidan C. Brady 999e2de8e6 Merge branch 'development' into 1.8
Conflicts:
	src/main/java/mekanism/client/gui/GuiPRC.java
2014-09-15 12:19:40 -04:00
jmongeon fb9ec04ef0 Add missing energy info tab Rotary Condensentrator Gui. 2014-09-12 02:31:34 -04:00
Ben Spiers fab95e8900 Re-organise imports.
I went for what seemed like a good level of organisation:

Java
__________
Mekanism
__________
Minecraft
Forge
FML
__________
Netty
LWJGL
__________
Other APIs
__________
Static Imports.
2014-09-03 19:00:03 +01:00
Aidan C. Brady e5f76907ce Rewrite networking code for the 100th time to fix memory leak 2014-06-11 11:57:49 +02:00
Aidan C. Brady 4446e14ba3 Sound system work 2014-06-02 23:57:40 +02:00
Aidan C. Brady 6f69c6d7b4 Major 1.7 work, down to a little more than 500 errors 2014-05-29 17:55:47 +01:00
tterrag1098 321fa4ed50 Some work on GUIs, mostly sfx 2014-05-06 02:57:39 -04:00
Ben Spiers 31938e8b68 Under 1300 errors left now, started on packet/network stuffs. 2014-04-20 21:15:44 +01:00
Ben Spiers db7121454a Re-add an updated ic2, alter CC and update DepLoader. Fix more of the things.
1792 errors. A good night's work, I think.
2014-04-20 04:34:19 +01:00
Ben Spiers ab47724473 Move the directory structure around to a more conventional one and start out on the 1.7 update.
3797 errors. We have a long way to go.
2014-04-20 03:44:06 +01:00