Commit Graph
65 Commits
Author SHA1 Message Date
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 5249c0b6c8 Add content renderers for the rest of the transmitters, everything works as far as I can see but for some reason it takes a block update to actually start calling the special renderers 2016-05-21 12:31:36 -04:00
aidancbrady 261a32ee01 Fixed slurry gas sprites, add chemical machine JEI handlers, start work on remaining machines 2016-05-20 11:13:01 -04:00
aidancbrady 571a14be17 Fixed continuous block updates, fixed Heavy Water texture 2016-05-18 11:19:00 -04:00
aidancbrady 10098e300d Fixed missing texture errors, fixed bounding block particles, fixed Digital Miner in-world and item render 2016-05-11 23:48:10 -04:00
aidancbrady 20bef9c94f More things are now rendering properly, we're almost done 2016-05-11 20:37:35 -04:00
aidancbrady 8b1017a3a8 Lots and lots of fancy rendering! 2016-05-11 17:42:51 -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 a1100dd47a More render work!
- Added BuildCraft impl to render Model3D
- Got Gas and Fluid icons working properly
- Fixed CTM crash
- Fixed Flamethrower flame rotation issue
- Fluid Tank now renders inner fluid
- Fix some texture errors
2016-05-10 19:37:00 -04:00
aidancbrady c6f3c162f9 More work 2016-05-09 19:59:16 -04:00
aidancbrady eba5f7e356 Work on TileEntity stuff. Details below.
I've added the method "Coord4D.safeTileGet()" which is likely going to be necessary in a lot of cases where duplicate TEs could be created- for some reason World.getTileEntity() fails to return the saved TileEntity fairly often.
2016-05-09 18:36:40 -04:00
aidancbrady 13893bd705 A good bit of work
- Fixed infuse sprites
- Fixed liquid sprites
- Fixed Plastic Fence block states
- got Plastic Fence to render in block form
2016-05-04 23:37:21 -04:00
aidancbrady 01a03ecbcf Factory Installer textures, fixed Walkie Talkie and Crafting Formula textures 2016-05-04 19:04:39 -04:00
aidancbrady b8877f9e49 Fixed shards, paxel textures, moved MekanismTools resources to individual assets folder 2016-05-04 16:47:04 -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 14aea16e3a Texture fixes 2016-03-26 17:42:12 -04:00
aidancbrady 42ca8c29b1 Fix to weird item texture winding bug. I don't know why I have to do this 2016-03-26 12:34:34 -04:00
aidancbrady 97bd7198d1 Texture fixes for @CyanideX 2016-03-26 01:39:22 -04:00
aidancbrady bfb17d45f6 Reorganized assets 2016-03-23 08:52:03 -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 f09010a927 Many more fixes 2016-02-28 19:11:43 -05:00
aidancbrady 7c160cc264 Interface and rendering fixes 2016-02-28 18:11:50 -05:00
aidancbrady c0f465d0cb Boiler rendering and interface, still yet to do statistics 2016-02-28 16:44:05 -05:00
aidancbrady 155758398c Continued boiler work 2016-02-28 11:52:52 -05:00
aidancbrady 3c1496740c Tiered Gas Tanks and tiered Fluid Tanks! 2016-02-24 17:01:43 -05:00
Ben Spiers 716aabece5 Fix merge 2016-02-20 22:58:17 +00:00
Ben Spiers b08bca67d4 Merge branch 'v9' into 1.8.9 2016-02-20 22:19:34 +00:00
aidancbrady 84da514b54 Rename Solar Evaporation Plant to Thermal Evaporation Plant 2016-02-18 18:37:38 -05:00
Ben Spiers 7b4fefeb60 Fix some of the things that were broken, add more type-specs. 2016-02-08 22:46:06 +00:00
Ben Spiers 93438f29a4 Stop Minecraft complaining about all those textures being missing 2016-02-08 15:54:39 +00:00
Ben Spiers 0179ea1f38 Mostly rendering improvements 2016-02-01 23:42:30 +00:00
Ben Spiers 25d0b7441b Merge branch 'v9' into 1.8.9
Forgot to complete the merge so some weird stuff might have ended up in the patch. Oops.
2016-02-01 23:40:35 +00:00
aidancbrady 88cfee2ab2 Changed Metallurgic Infuser infuse system to use icons for textures 2016-01-29 17:47:41 -07:00
Ben Spiers 5e54c0a681 The mod now compiles and runs,
if the following packages are excluded:
client.gui (Haven't worked out guis yet)
client.nei (NEI isn't here yet)
client.render.block (ISBRH doesn't exist any more)
client.render.item (Nor do Item renderers)
common.multipart (Nor does CB's FMP)
generators (Couldn't be bothered, will fix when more of Mek Core works again)
2016-01-25 20:42:29 +00:00
Ben Spiers a556fffc4f Fix various client and other stuff 2016-01-25 20:18:28 +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
Ben Spiers d4ca659ed0 More Client fixes 2016-01-22 00:20:29 +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 bf5e6b788f A few fixes for the last commit 2015-03-26 17:23:41 -04:00
Aidan C. Brady 7afef3f8ee Fixed an API issue, implemented new default icon system to allow for dynamic factory icons based on recipe type 2015-03-26 17:10:32 -04:00
Aidan C. Brady 2d727b56ca Fixed some naming - factories now display their complete names 2015-03-26 10:17:06 -04:00
Aidan C. Brady f83d481fd6 Rewrote multiblock data saving, changed simple side names 2015-03-25 21:49:07 -04:00
Aidan C. Brady 19e0530253 New fancy machine icon renderer - rotates top and bottom icon based on facing, also adds support for resource pack-based side textures 2015-03-25 01:19:37 -04:00
Aidan C. Brady d4d7e88c4e Developed and implemented the foundation for Item/Gas/Energy/Fluid/Heat dynamic side configuration.
As of now, only items are supported, and the actual config GUI has not been changed. Only gameplay difference is three new configurator modes.
2015-03-07 19:09:23 -05:00
Aidan C. Brady 1c0fe96fed Energized Induction Matrix work! 2015-03-02 23:05:54 -05:00
Aidan C. Brady 439a734ce0 Fixed up Solar Neutron Activator NEI handler, better DT fuel texture 2015-02-27 14:06:38 -05:00
Aidan C. Brady 955160ff45 Lithium! 2015-02-25 08:44:24 -05:00
Aidan C. Brady 25df777b84 Work on fusion fuel creation mechanics, allowed Chemical Washer to accept upgrades 2015-02-17 21:27:35 -05:00
Aidan C. Brady 50f7df5f98 Merge branch 'development' into v8
Conflicts:
	build.properties
	src/main/java/mekanism/api/gas/GasNetwork.java
	src/main/java/mekanism/api/transmitters/DynamicNetwork.java
	src/main/java/mekanism/client/ClientTickHandler.java
	src/main/java/mekanism/common/EnergyNetwork.java
	src/main/java/mekanism/common/FluidNetwork.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/recipe/RecipeHandler.java
	src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/generators/common/block/BlockGenerator.java
2015-02-10 18:39:15 -05:00