Commit Graph
32 Commits
Author SHA1 Message Date
Richard Freimer 9d98ef575d Port config rewrite (#5378)
Port Config system, Remove some unused code, Refactored various Tier enums out into their own package
2019-04-11 07:18:59 +08:00
Dave Smith e0b7ea62a4 The Great Reformat; moving to google-java-style w/ 4 space indent and 120 column line wrap 2019-03-09 22:47:13 -07:00
Tom Elfring b72d6efab3 Java 7 and 8 cleanup
Diamond operator <>
Lambdas and method references
2017-08-05 17:50:38 +02:00
Tom Elfring 678581f440 Update Forge, fix NBT recipes, added recipe generator 2017-06-25 13:39:38 +02:00
Tom Elfring a13ce7910d Update mappings to 20170616 2017-06-16 20:26:39 +02:00
Tom Elfring 2eabbe4b38 First pass 1.12 port 2017-06-15 15:01:45 +02:00
aidancbrady 20bef9c94f More things are now rendering properly, we're almost done 2016-05-11 20:37:35 -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
aidancbrady 840af06f43 Fixed up some textures, start working on a CTM rewrite 2016-05-05 22:52:57 -04:00
aidancbrady b3b714cd36 Gas Tank and Fluid Tank state management & renders, along with tier colors. I'm getting the hang of this! 2016-05-05 15:25:09 -04:00
aidancbrady 045b2119f2 Merge branch 'development' into 1.8.9
* development:
  Fancy Energy Cube colors!
  A better fix
2016-05-03 22:37:05 -04:00
aidancbrady 8c6a7c01ef Fancy Energy Cube colors! 2016-05-03 18:54:53 -04:00
Ben Spiers 7efa4bcdbb Fixing things 2016-04-26 17:40:17 +01:00
Ben Spiers 8064beb0fc Fix compile errors from merge 2016-04-25 17:47:54 +01:00
Ben Spiers 0cb18773aa Merge branch 'development' into 1.8.9 2016-04-25 16:08:06 +01:00
aidancbrady a95f231fcc Energy Cube fancy render 2016-04-18 14:06:33 -04:00
aidancbrady 7387f15b64 New and fixed models! Energy Cubes look awesome. 2016-04-16 17:14:02 -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 c5987588b8 Make Coord4D work as a BlockPos better. 2016-01-30 21:50:22 +00: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 a556fffc4f Fix various client and other stuff 2016-01-25 20:18:28 +00:00
Ben Spiers 70f440446f Change TESRs to the new generic system.
Some of these will presumably end up in the blockstate model system later.
2016-01-14 19:23:58 +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
Aidan C. Brady 6847a1e9ee Minor cleanup 2015-03-17 17:36:32 -04:00
Aidan C. Brady ce31b1e22c Start work on the Energized Induction Matrix. This is going to be fun! 2015-02-28 13:08:17 -06: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 5f26402bd9 Minor cleanup and tabs 2014-07-21 21:48:28 +01:00
jstockwin 0a9dbec78c Stop energy cube core rendering when cube is empty.
This will stop it from blocking out other rendering when it's not opaque
enough to be visible
2014-07-21 21:14:12 +01:00
Aidan C. Brady 4446e14ba3 Sound system work 2014-06-02 23:57:40 +02: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