aidancbrady
16c052e8ca
Bump to 9.4.4
2017-12-17 10:54:56 -05:00
Xander Victory
c298841dd9
bump to 9.4.3 and make generators/tools have a hard dependency on the EXACT same version of core
2017-11-30 12:34:42 +08:00
aidancbrady
4ef4f8614d
Cleanup, bump version to 9.4.2, bump MC version to 1.12.2
2017-11-16 12:34:04 -05:00
Joseph C. Sible
ed2ae90c67
Nuggets!
...
- Add a nugget corresponding to each ingot that we add
- Add the usual crafting recipes between ingots and nuggets
- Make MekanismTools items smelt into nuggets like vanilla items do
2017-09-24 13:37:05 -04:00
aidancbrady
f9ec882bce
Verison bump
2017-08-31 12:17:27 -04:00
Tom Elfring
51ccbd1c2c
And bound it to [1.12,1.13)
2017-08-09 20:23:25 +02:00
Tom Elfring
7b10a0259c
Make 1.12.1 work on 1.12
2017-08-09 19:42:08 +02:00
Tom Elfring
5dd3dbb8a9
Code cleanup
...
Redundent assignments
Wrong comparison of string with MRL
Unneeded reflection
Try with resources
Metallurgy compat deleted (was outcommented) not updated since MC 1.7.10
2017-08-06 13:38:32 +02:00
aidancbrady
18036c7a33
Bump version- 1.12 will be released under version 9.4.0
2017-08-05 19:45:41 -07:00
Tom Elfring
27fcb7ec3e
Fix some build errors caused by cleanup
2017-08-05 18:40:08 +02: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
c9dc4c0ac0
Merge remote-tracking branch 'upstream/1.11' into 1.12
2017-08-04 18:49:20 +02:00
aidancbrady
603d8d5b02
Bump version
2017-08-01 10:12:49 -07:00
Tom Elfring
678581f440
Update Forge, fix NBT recipes, added recipe generator
2017-06-25 13:39:38 +02:00
Tom Elfring
0a98701c7b
Update to new Forge registry standards
2017-06-24 16:55:14 +02:00
Tom Elfring
0a670c1e0b
Merge upstream
2017-06-20 19:36:05 +02:00
Tom Elfring
bac3c884c1
Add more recipes
2017-06-19 20:39:49 +02:00
aidancbrady
a39571d837
Bump version to 9.3.3
2017-06-17 11:31:16 -07:00
aidancbrady
2c1532b293
Version bump
2017-06-10 10:58:33 -07:00
aidancbrady
986ce14f2e
Bump version, fixed Purification Chamber sounds, fixed empty Configurator mode
2017-05-27 19:39:24 -07:00
aidancbrady
c9cbb405d4
More API fixes
2017-04-13 16:15:26 -04:00
aidancbrady
c89d7d49b9
Bump version, temporary asset purge
2017-03-28 21:04:58 -04:00
aidancbrady
2b02042f4c
Bump version for release
2017-03-24 11:28:26 -04:00
aidancbrady
35d1b4f755
Fix armor balance order
2017-02-12 13:57:03 -05:00
aidancbrady
b6d5a34121
Bump version to 9.2.1
2016-09-12 16:40:16 -04:00
aidancbrady
7dfc9db949
Bump version to 9.2, add Minecraft version-based version handling
2016-08-11 12:15:16 -04:00
aidancbrady
a9177a0989
Bump version to 9.1.1
2016-08-05 21:28:23 -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
286394f7ac
Merge branch 'development' into 1.9.4
...
* development:
Fixed Bin amount render position
Bump version to 9.0.3, change Wind Generator weather category, fix Logistical Sorter sound config bypass, fixed Thermal Evaporation Plant internal render
Conflicts:
build.properties
src/main/java/mekanism/client/render/tileentity/RenderBin.java
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java
src/main/resources/assets/mekanism/sounds.json
2016-06-22 14:29:27 -04:00
aidancbrady
44ecdd41d0
Bump version to 9.0.3, change Wind Generator weather category, fix Logistical Sorter sound config bypass, fixed Thermal Evaporation Plant internal render
2016-06-22 14:20:22 -04:00
aidancbrady
eb7c2d1b78
Merge branch 'development' into 1.9.4
...
* development:
Fixed Turbines unable to be formed in other dimensions
Bump version to 9.0.2
Fixed Personal Chest crash, bumped default Fuelwood Heater generation, added some null checks to prevent crashes
Fixed outputting energy above Integer.MAX_VALUE to other mods, fixed tiered factories not supporting muffling upgrades, fixed boiler valve height interaction
Conflicts:
src/main/java/mekanism/common/LaserManager.java
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/common/block/BlockMachine.java
src/main/java/mekanism/common/entity/EntityFlame.java
src/main/java/mekanism/common/tile/TileEntityBoilerValve.java
src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
src/main/java/mekanism/common/tile/TileEntityLaser.java
src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java
src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java
src/main/java/mekanism/common/util/MekanismUtils.java
src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java
2016-05-28 02:34:55 -04:00
aidancbrady
02d2aa1550
Bump version to 9.0.2
2016-05-28 02:02:31 -04:00
aidancbrady
c73eef6be8
<400 errors
2016-05-25 10:10:47 -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
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
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
aidancbrady
e6f4102087
New "InternalMultiblock" framework to allow for easier multiblock component management, added "hot" state to superheating elements
2016-03-22 19:29:18 -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
39dc016908
Merge branch 'v9' into 1.8.9
2016-01-19 17:57:19 +00:00
aidancbrady
4c2b470213
Renamed Wind Turbine to Wind Generator, started work on turbine rods/blades for Industrial Turbine
2016-01-17 15:59:02 -05:00
Ben Spiers
1dfba5e6c9
Fix the compile errors in MekTools
2016-01-14 19:25:23 +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
aidancbrady
9b3969f1ff
Shapeless Mekanism Recipes, IMC crafting recipe integration, fixed removal of machine recipes
2016-01-12 18:41:15 -05:00
aidancbrady
6466463a63
Bumped version
2015-11-26 15:44:42 -07:00
Ben Spiers
9a3f0ae633
Version Number Update: 8.1.7
2015-07-28 18:46:00 +01:00
aidancbrady
7607a135ce
Bump version to 8.1.6
2015-06-23 15:20:03 -07:00