Commit Graph
2197 Commits
Author SHA1 Message Date
aidancbrady f58924bc03 Fixed potential desyncs 2017-08-11 09:30:42 -07:00
aidancbrady 1937d81b81 Merge branch '1.11' into 1.12
* 1.11:
  Customizable Quantum Entangloporter energy transfer rate
2017-08-09 11:50:55 -07:00
aidancbrady 36602926dd Customizable Quantum Entangloporter energy transfer rate 2017-08-09 11:50:44 -07: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 0f3e5175d4 Merge remote-tracking branch 'upstream/1.11' into 1.12 2017-08-09 19:40:46 +02:00
Tom Elfring a4958ae8c9 Temp-fix quantum entangloporter and fix ThermoConductor losing tier
Fixes #4605
Fixes #4606
2017-08-09 19:39:06 +02:00
Tom Elfring 049c780888 Move mod id references to a constant 2017-08-07 20:16:16 +02:00
Tom Elfring 5bcdb2b2be Merge remote-tracking branch 'upstream/1.11' into 1.12 2017-08-07 20:09:31 +02:00
Tom Elfring 29615cc6a9 Merge branch '1.11' of github.com:aidancbrady/Mekanism into 1.11 2017-08-07 20:00:52 +02:00
Tom Elfring 2e38fb9748 Fix some mod integrations not working.
Moved all mod id definitions to a constant value in MekanismHooks.
Fix integration with ComputerCraft, OpenComputers and IC2.

Fix #4603
2017-08-07 19:59:32 +02:00
aidancbrady 3dd14b3aa4 Minor fix 2017-08-07 09:24:42 -07:00
aidancbrady 95c5e38a8e Merge branch '1.11' into 1.12
* 1.11:
  Added full-fledged JEI ingredient support for Mekanism gases. Thanks to @mezz for making this possible

Conflicts:
	src/main/java/mekanism/client/jei/MekanismJEI.java
	src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeCategory.java
	src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeWrapper.java
	src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeWrapper.java
	src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeWrapper.java
	src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeWrapper.java
	src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeWrapper.java
	src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java
	src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeWrapper.java
	src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeCategory.java
	src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeWrapper.java
	src/main/java/mekanism/client/jei/machine/other/PRCRecipeCategory.java
	src/main/java/mekanism/client/jei/machine/other/PRCRecipeWrapper.java
	src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java
	src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeCategory.java
	src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeWrapper.java
	src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeCategory.java
2017-08-06 13:19:46 -07:00
aidancbrady 7b9bf21942 Added full-fledged JEI ingredient support for Mekanism gases. Thanks to @mezz for making this possible 2017-08-06 13:09:45 -07:00
Tom Elfring f7a470f3fb Fix some NPE in VoiceInput 2017-08-06 15:33:53 +02:00
Tom Elfring 36e917a444 Fix missing semicolon 2017-08-06 14:13:19 +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
Tom Elfring 6bdd00ac49 Fix recipes with circuits oredict disabled.
When ControlCircuitOreDict is disabled in the config, all recipes which use circuits still pointed towards the oredict. Resulting in invalid recipes when no other mod provide these oredicts.
2017-08-06 11:23:35 +02:00
aidancbrady 18036c7a33 Bump version- 1.12 will be released under version 9.4.0 2017-08-05 19:45:41 -07:00
aidancbrady b40cd5c20e Merge branch '1.11' into 1.12
* 1.11:
  add a couple of comments [no-ci]
  add Anchor Upgrade to Entangleporter
  Store Quantum Entangleporter frequency (name and public/private only) in the itemstack when dismantled. Displayed in the sneak key info tooltip.
  Increase Entangleporter frequency to be able to store as much as ultimate tiers can transmit.
  static field access to Class access

Conflicts:
	src/main/java/mekanism/common/frequency/Frequency.java
	src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java
2017-08-05 19:43:27 -07:00
aidancbrady 4d4e66eb57 Cleanup 2017-08-05 19:41:48 -07:00
aidancbrady 167f791502 Fixed Bin Recipes 2017-08-05 19:37:35 -07:00
Xander 5ef8cf367c add a couple of comments [no-ci] 2017-08-06 09:34:58 +08:00
Tom Elfring 34e81bb65d Remove ~350 unsave casts 2017-08-05 19:48:12 +02:00
Tom Elfring 27fcb7ec3e Fix some build errors caused by cleanup 2017-08-05 18:40:08 +02:00
Tom Elfring 9fc52c6016 Fix some JavaDoc warnings 2017-08-05 18:32:20 +02:00
Xander aabcd0d77a add Anchor Upgrade to Entangleporter 2017-08-06 00:18:39 +08: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
Xander 81e56b207c Store Quantum Entangleporter frequency (name and public/private only) in the itemstack when dismantled. Displayed in the sneak key info tooltip. 2017-08-05 22:49:50 +08:00
Xander 7b3f4e8e2a Increase Entangleporter frequency to be able to store as much as ultimate tiers can transmit. 2017-08-05 21:44:51 +08:00
Xander 45b48600d0 static field access to Class access 2017-08-05 21:01:42 +08:00
Tom Elfring 3db03edbc9 Java5 cleanup
- Replace for loops with foreach
- Remove unnecessary boxing
2017-08-05 14:06:36 +02:00
Tom Elfring 6721909e84 Remove unused exceptions
Access static variables through class, not instances
Remove non-looping for loops
2017-08-05 13:46:11 +02:00
Tom Elfring 6576335f44 Remove unnecessary modifiers and semicolons 2017-08-05 13:30:20 +02:00
Tom Elfring 7e43e1a628 Add more recipes to colourd blocks (1.11) 2017-08-05 12:52:31 +02:00
Tom Elfring 6bee0a34ce Add more recipes to colourd blocks 2017-08-05 12:37:48 +02:00
Tom Elfring 8ce29244c8 Cleanup recipes, use oredict wildcards for colours 2017-08-04 19:34:36 +02:00
Tom Elfring c9dc4c0ac0 Merge remote-tracking branch 'upstream/1.11' into 1.12 2017-08-04 18:49:20 +02:00
aidancbrady d38d519238 Fixed crash 2017-08-02 20:54:17 -07:00
Tom Elfring 1de4ebf67a Merge remote-tracking branch 'upstream/1.11' into feature-CTM 2017-08-01 19:52:30 +02:00
aidancbrady ebb7ca9c7b Cleanup 2017-08-01 10:41:31 -07:00
Aidan 69b39c6bea Merge pull request #4426 from PlayerWithoutName/evaporatorFix
Fixed evaporator liquid rendering
2017-08-01 10:39:39 -07:00
aidancbrady 603d8d5b02 Bump version 2017-08-01 10:12:49 -07:00
aidancbrady 60317be794 Fixed Formulaic Assemblicator bucket issue, attempt to maven-ize IC2 2017-08-01 09:41:48 -07:00
aidancbrady 5bd67b37b2 Fixed IC2 integration 2017-07-31 19:41:24 -07:00
aidancbrady 8ed83b0e4f Merge branch '1.11' into 1.12
* 1.11:
  Fixed the horrible transmitter issue (spec: DynamicNetwork:215-218) Also, fixed client render update delay
  move zh_cn lang file back to thr correct place
  Update entity names
  Another cleanup
  Fix dev environment after adding SD compat
  Kill off some unused code
  Updated minor compat

Conflicts:
	build.gradle
2017-07-31 18:40:01 -07:00
aidancbrady 9801b12b62 Fixed the horrible transmitter issue (spec: DynamicNetwork:215-218)
Also, fixed client render update delay
2017-07-31 18:38:46 -07:00
Gunther De Wachter edf7a39c42 Fixed bug in Pos3D due to mappings update 2017-07-31 06:26:07 +02:00
Tom Elfring 83f06d6ba2 Fix active block states.
Allowed Thermal Evaporation Controller and Induction Port to have active states.
Allowed Reactor Controller and Reactor Port to have active states.
Disallowed Reactor Focus Matrix to have active states.
Fix issue with Reactor Glass and Reactor Laser Matrix should side render.
2017-07-30 16:18:10 +02:00