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
Ben Spiers
89be8b4482
Fix using localised names for overlay textures.
2015-01-10 17:47:16 +00:00
Ben Spiers
4a404dfc78
Improve Heat mechanic, and get it rendering nicely.
...
Colour temperature algorithm adapted from http://www.tannerhelland.com/4435/convert-temperature-rgb-algorithm-code/ - thanks to Tanner Hellan for the useful post.
2014-12-20 02:09:14 +00:00
Ben Spiers
5b4f154040
Giant optimise imports.
2014-11-10 21:53:29 +00: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
215cebb143
Remove unused internal class
2014-09-02 18:44:31 +01:00
Ben Spiers
c21404dd2d
Make the tank-type renderers reset their DisplayLists on texture reload.
...
This will prevent missing-texture/wrong-texture weirdness when changing texturepacks in-world. Also noticed that two old render classes from my first rewrite of transmitter rendering are now unused, so deleted them.
2014-09-02 18:44:31 +01:00
Aidan Brady
1d6de974d3
A bit of package reorganization, added InventoryNetwork to transporters
2014-08-09 22:20:49 -04:00
Aidan C. Brady
69a411813e
Started work on a Digital Miner visual render thing. For some reason it's culling all oceans.
2014-07-21 01:10:53 -04:00
Ben Spiers
2e7d3a1945
Work on making it work Client-side.
2014-07-19 03:23:11 +01:00
Ben Spiers
bdde617489
More work on Fusion Reactor
2014-07-16 02:54:13 +01:00
Aidan C. Brady
65a8633441
Gave Chemical Oxidizer and PRC upgrade systems, fixed Chemical Oxidizer and Electrolytic Separator NEI modules
2014-07-10 22:28:04 -04:00
Aidan C. Brady
81477966ee
Fix all render issues. 1.7 is now officially more stable than 1.6 (but not stable enough)
2014-06-12 18:16:20 +02:00
Aidan Brady
7496ac7648
Some 1.7 work. Just about 800 errors!
2014-05-07 16:37:58 -04: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