Commit Graph
138 Commits
Author SHA1 Message Date
Thiakil 2b6fafda56 Bump version (also fixes #5026) 2018-04-27 18:15:07 +08:00
Thiakil e38f1038c7 forgot to update the Version object instances 2018-04-27 11:27:48 +08:00
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
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 babbe59cab Cleanup
Removed unused imports
Add/remove all methods used for arrays
Removed manual array copy
2017-08-05 18:12:45 +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 df68b1e36a Merge remote-tracking branch 'upstream/1.11' into 1.12_firstpass 2017-07-23 13:56:41 +02:00
Aidan dbb86e344d Merge pull request #4523 from thommy101/issue-4513
[1.11] Update BuildCraft API to maven dependency
2017-07-22 20:32:49 -07:00
Tom Elfring 6ba975b84f Add multiblock structures to cardboard blacklist.
Fixes #3613
2017-07-19 11:57:26 +02:00
Tom Elfring b886d39866 Fix wrong cast BC integration 2017-07-17 15:36:00 +02:00
Tom Elfring f9c6dc011b Fix conversion rate BC-RF-Mekanism 2017-07-17 15:30:19 +02:00
Tom Elfring 2608daf243 Fixed Generator recipes not loading.
Also fixed a decompworkspace issue with JEI being loaded twice.
2017-07-16 19:15:53 +02:00
Tom Elfring a32824a434 Update BC to a maven dependency 2017-07-10 18:56:31 +02:00
Tom Elfring e860089535 Update BuildCraft API to 218FB4A 2017-07-10 18:19:00 +02:00
Tom Elfring 2b44ab8666 ReAdd disabling of machines crafting recipes 2017-07-10 13:33:40 +02: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 f2f96ce8f1 Added configurable Fusion Reactor energy generation, don't know why that didn't exist before 2017-06-03 16:07:18 -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 c7a74d239b Better MekanismGenerators config GUI, removed reactor API, better reactor recipe management 2017-04-13 14:42:25 -04:00
aidancbrady b355b80cf4 Fixed mod IDs, fixed generator recipes, added enabling/disabling of generators via config 2017-04-13 01:42:02 -04:00
aidancbrady 810c089040 Fix some fluid issues 2017-04-05 10:17:36 -04:00
aidancbrady 3d86b75da4 Better gas management 2017-04-04 19:45:51 -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 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 90a587383e Merge branch 'development' into 1.9.4
* development:
  A few minor fixes, added Ultimate Tier Installer texture
  New textures, round 1.

Conflicts:
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/generators/common/block/BlockGenerator.java
2016-07-18 15:56:27 -04:00
aidancbrady 38024f98ad A few minor fixes, added Ultimate Tier Installer texture 2016-07-18 15:17:47 -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 28846dcb73 Rename Factory Installer to Tier Installer, add recipe for Saturating Condenser, add tier upgrade support for Energy Cube, Gas Tank, Fluid Tank and Bin 2016-07-06 17:21:24 -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 53353cd050 Fixed IC2 support (still may crash without), begin adding Tesla support 2016-07-01 11:05:02 -04:00
aidancbrady 202f917345 Begin porting fluid items 2016-06-30 10:41:55 -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