Commit Graph
22 Commits
Author SHA1 Message Date
aidancbrady 6a42eb64e3 Update to 1.11.2. Untested, still using outdated MCMP 2017-03-25 20:35:26 -04:00
aidancbrady 53353cd050 Fixed IC2 support (still may crash without), begin adding Tesla support 2016-07-01 11:05:02 -04:00
aidancbrady af008b9395 <1000 errors 2016-05-24 23:35:37 -04:00
aidancbrady d5656b0264 Merge branch 'development' into 1.8.9
* development:
  Fixed Turbine Stats crash
  Fixed Turbine container crash
  Bumped version, fixed Steel Casing recipe, fixed erratic heat behavior, fixed Turbine render crash, added missing localization, fixed Bin crafting crash
  ja_JP.lang - translate generators and ores tooltip, fix some entries
  ja_JP.lang - translate general machinery and Blocks(without ores) tooltip.
  ja_JP.lang - little fix/change
  ja_JP.lang - fix/change some entries
  ja_JP.lang - translate tooltip and gui text
  ja_JP.lang - gui and tooltip translation progress
  ja_JP.lang - fix/change some translation(items and blocks)
  ja_JP.lang tweak some entries based on v9

Conflicts:
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/util/RecipeUtils.java
2016-05-21 15:31:26 -04:00
aidancbrady 0e0f9584f3 Bumped version, fixed Steel Casing recipe, fixed erratic heat behavior, fixed Turbine render crash, added missing localization, fixed Bin crafting crash 2016-05-21 13:52:28 -04:00
aidancbrady be863a4289 Add Mekanism Shaped and Mekanism Shapeless recipe handlers, use ItemDataUtils to consolidate non-subtype-based NBT data into a single compound 2016-05-19 18:48:59 -04:00
aidancbrady 59eca85008 Complete merge, fixed third person perspective, add Digital Miner overlay, clean up Energy Cube tier management 2016-05-12 00:35:39 -04:00
Ben Spiers 85c67666ad Merge branch 'development' into 1.8.9 2016-05-01 23:57:29 +01:00
aidancbrady c4520a072b Crash fixes 2016-04-30 01:24:14 -04:00
Ben Spiers 0cb18773aa Merge branch 'development' into 1.8.9 2016-04-25 16:08:06 +01:00
Ben Spiers 78c2afb5ea Actually get it compiling again.
Seems to run ok, I think?
2016-04-25 13:11:26 +01:00
aidancbrady 9c480954e3 Polished security desk interface and machine interaction. Need to start integrating now, so far only complete in metallurgic infuser 2016-03-21 13:30:59 -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 650b725567 Use handy Forge methods for damage display instead of setting item damage in gas/energy/fluid indicators 2016-03-17 14:23:53 -04:00
aidancbrady 38a68541c4 Tiered Bins, better tier management! 2016-03-16 21:41:55 -04:00
aidancbrady 9c8e392638 Loads more work on Formulaic Assemblicators. Seem to be about polished! 2016-03-15 19:07:22 -04:00
aidancbrady a247a80d53 Work on Formulaic Assemblicator, got a lot more of the core logic done than I was expecting to 2016-03-06 17:53:16 -05:00
aidancbrady d332ad49b7 More consolidated fluid container management- I've been meaning to get to this for a long time 2016-03-06 02:15:56 -05:00
aidancbrady 3c1496740c Tiered Gas Tanks and tiered Fluid Tanks! 2016-02-24 17:01:43 -05:00
Ben Spiers dd99f582af State & Render stuffs, get the MInfuser rendering again.
Still no textures. WIP.
2016-01-27 01:36:39 +00:00
Ben Spiers a80f724cc2 Apply various common one-to-one replacements
More work on common too. network package now done.
2016-01-23 13:24:51 +00:00
aidancbrady 9b3969f1ff Shapeless Mekanism Recipes, IMC crafting recipe integration, fixed removal of machine recipes 2016-01-12 18:41:15 -05:00