Xander
1415288bcf
fix String#toLowerCase() calls to toLowerCase(Locale.ROOT). Fixes #4957
2018-03-24 17:09:44 +08:00
Joseph C. Sible
6cafac7166
Make combining factories work again
2017-10-02 21:19:00 -04:00
aidancbrady
3dd14b3aa4
Minor fix
2017-08-07 09:24:42 -07:00
Tom Elfring
6576335f44
Remove unnecessary modifiers and semicolons
2017-08-05 13:30:20 +02:00
aidancbrady
f4570f61d2
Make factories respect machine energy usage, fixed creative gas tanks and fluid tanks integer overflow
2017-05-27 15:12:51 -07:00
aidancbrady
808f0cdf8a
More refactoring, gave Rotary Condensentrator and Electrolytic Separator sound effects. Need to fix bugs
2017-04-27 22:51:44 -04:00
aidancbrady
c9cbb405d4
More API fixes
2017-04-13 16:15:26 -04:00
aidancbrady
6eb8e59f3c
Fix more ItemStack issues
2017-04-03 20:12:02 -04:00
aidancbrady
7b48129909
Merge branch 'development' into 1.9.4
...
* development:
Add necessary networking to Reactor Port
Better tooltips
Actually fix tier installers
Add Silicon crusher recipe, fixed Tier Installers
Rename Factory Installer to Tier Installer, add recipe for Saturating Condenser, add tier upgrade support for Energy Cube, Gas Tank, Fluid Tank and Bin
Bump version to 9.1, add Laser Amplifier comparator support, add Saturating Condensers to recycle water from Industrial Turbines
Conflicts:
build.properties
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/common/MekanismItems.java
src/main/java/mekanism/common/item/ItemFactoryInstaller.java
src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
src/main/java/mekanism/common/tile/TileEntityBin.java
src/main/java/mekanism/common/tile/TileEntityElectricMachine.java
src/main/java/mekanism/common/tile/TileEntityFactory.java
src/main/java/mekanism/common/tile/TileEntityFluidTank.java
src/main/java/mekanism/common/tile/TileEntityGasTank.java
src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java
src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java
src/main/java/mekanism/generators/common/block/BlockGenerator.java
src/main/java/mekanism/generators/common/block/BlockReactor.java
src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java
src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPort-ctm.png
src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPort.png
src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPortInput-ctm.png
src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPortInput.png
src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_port-ctm.png
src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_port.png
2016-07-06 18:38:29 -04:00
aidancbrady
95c0ad4a73
Bump version to 9.1, add Laser Amplifier comparator support, add Saturating Condensers to recycle water from Industrial Turbines
2016-07-06 16:56:24 -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
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
758bc49515
Factory textures & block states, working perfectly
2016-05-05 18:45:40 -04: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
5aaea55900
Infusing Factories. They're finally here
2016-01-29 21:13:05 -07: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
245d5ed471
Base fixes
2016-01-22 00:20:45 +00:00
aidancbrady
f5979e26bc
Fixed Purification Chamber issue
2015-06-05 09:56:21 -04:00
aidancbrady
9ffc1bdff3
Localization fixes, part 1
2015-05-10 19:04:42 -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
Ben Spiers
9936c05da7
Recipe and upgrade fixes.
2015-03-21 19:11:56 +00:00
Aidan C. Brady
bf4b74f535
A few fixes
2015-02-19 17:17:28 -05:00
Ben Spiers
b75ff5d9a1
Cache all the things.
...
(Provided those things are computationally expensive to recalculate, and the memory cost of caching them is less than the time cost of recalculating them each time.)
2014-09-06 21:14:49 +01:00
Ben Spiers
3c547fa0aa
Fix factories and smelting.
2014-09-05 18:31:10 +01:00
Ben Spiers
c7a429177b
More work in the quest for greater recipe efficiency.
2014-09-05 04:20:12 +01:00
Ben Spiers
ce6946c669
Massive recipe system overhaul.
...
They should be much more efficient now (this reduced the tick time of the CI Chamber by 3-4x in my testing), due to being able to just use the HashMap's get() instead of being limited to iterating through entries. NEI integration code now a lot more readable and type-safe as well.
2014-09-04 04:26:55 +01: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
da6cbeb46d
More big sound work
2014-08-27 23:16:59 +01:00
Aidan Brady
1d6de974d3
A bit of package reorganization, added InventoryNetwork to transporters
2014-08-09 22:20:49 -04:00