Commit Graph
25 Commits
Author SHA1 Message Date
Tom Elfring b72d6efab3 Java 7 and 8 cleanup
Diamond operator <>
Lambdas and method references
2017-08-05 17:50:38 +02:00
Tom Elfring df68b1e36a Merge remote-tracking branch 'upstream/1.11' into 1.12_firstpass 2017-07-23 13:56:41 +02:00
Tom Elfring f6c126af44 Add max energy to tooltips 2017-07-17 20:27:05 +02:00
Tom Elfring a13ce7910d Update mappings to 20170616 2017-06-16 20:26:39 +02:00
aidancbrady c9cbb405d4 More API fixes 2017-04-13 16:15:26 -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 5ed86f3f01 Extend security to generators, gas tanks and energy cubes 2016-03-21 23:14:38 -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 62e7cc8f65 Merge branch 'v9' into 1.8.9 2016-01-30 00:47:54 +00:00
aidancbrady a22b33a629 Energy Cubes and Gas Tanks now have configurable item inputs and gas/energy outputs, fixed Portable Tank item output 2016-01-29 00:34:50 -05: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 e47f6032c1 Localization fixes 2015-03-24 11:39:25 -04: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 48b895b80a Fixed cables screwing up over chunk boundaries, fixed positioning of title text on certain machines, added a few tooltips to Induction Cells & Providers 2015-03-04 13:38:41 -05:00
Aidan C. Brady c39e3d1c1f More dropper work 2015-02-26 20:50:02 -05: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
Ben Spiers 725b7463f0 Make the mod classes significantly less godlike.
Move Config variables into their own class, (in api because other stuff in API references config, may make sense to move it back to common later), and move Blocks and Items into final variables in their own classes. It looks a lot cleaner this way and my OCD can finally rest now.
2014-08-01 01:35:06 +01:00
Aidan C. Brady d1c193d0dd Loads more work. 275 errors. 2014-05-29 19:01:43 +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