Commit graph

2910 commits

Author SHA1 Message Date
modmuss50
51f7de7210
Push to dual versions 2016-12-27 20:04:38 +00:00
modmuss50
b2d070c7f3
Fix compile errors, and bump forge to 1.11.2 2016-12-27 19:47:54 +00:00
modmuss50
0922e0b886
Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/init/IC2Dict.java
#	src/main/java/techreborn/init/ModRecipes.java
#	src/main/java/techreborn/init/OreDict.java
2016-12-26 23:49:42 +00:00
ProfessorProspector
415660c988 Tweak how nugget recipes are done once again, and \o/ 2500th commit! 2016-12-22 15:12:13 -08:00
ProfessorProspector
2e9bf11569 Fix nuggets -> ingot recipes 2016-12-22 14:40:24 -08:00
ProfessorProspector
68d5a49d75 Add iridium reinforced stone & tungstensteel block recipes 2016-12-22 14:39:10 -08:00
ProfessorProspector
a446c76397 Add nuggets -> ingot and ingot -> nuggets recipes 2016-12-22 14:33:21 -08:00
Modmuss50
74b9b03dd3 Merge pull request #869 from al132/1.10.2-v1
Fix display slots in Fusion Reactor JEI
2016-12-22 17:35:11 +00:00
al132
8306ebc72c Fix display slots in Fusion Reactor JEI 2016-12-22 11:29:07 -06:00
ProfessorProspector
ed766b0623 #releaseBuild 2016-12-21 17:40:08 -08:00
ProfessorProspector
3162422ee2 remove more debug code 2016-12-21 17:12:24 -08:00
ProfessorProspector
73f362bf76 Actually fix gems ore dict 2016-12-21 17:08:13 -08:00
ProfessorProspector
2ecf8400b8 Fix red garnet drops 2016-12-21 17:03:34 -08:00
ProfessorProspector
bdde7859f9 Fix any other potential bugs with the gems or any other forgotten items from the great rename of December 2016. This day shall be known as the day that I have prevented more bugs from the 8 or so bug reports I have caused from a single line of code changed about a week ago. It was a shame that it had gotten so far, but this should make sure that it does not happen again. All ingots/gems/plates/dusts/nuggets/smalldusts now convert any camelCase input to snake_case before handling it. This is probably the longest commit message I have ever written. Closes #860 2016-12-21 16:47:53 -08:00
ProfessorProspector
bfa6e657a6 Closes #861 2016-12-21 16:43:24 -08:00
ProfessorProspector
948d4de3ad Fix block ore dictionary names 2016-12-21 16:41:33 -08:00
ProfessorProspector
1759199601 Remove debug code 2016-12-21 16:22:34 -08:00
ProfessorProspector
011f164bd7 Fix gem ore dictionary entries 2016-12-21 16:20:34 -08:00
ProfessorProspector
78a3d1f589 Revert ore dictionary commit which said it fixed it but actually broke it :P #releaseBuild 2016-12-21 15:59:27 -08:00
modmuss50
7a6b3b6b48
Added a config to allow the de-duplication of ic2 items. When this is enabled TR will require you to use ic2's recipes. #releaseBuild 2016-12-21 17:57:36 +00:00
modmuss50
936ee13686
Remove last duplicated items. 2016-12-21 17:44:44 +00:00
modmuss50
5ff09a7eda
Some more work on deduplicating ic2 items/blocks 2016-12-21 17:31:52 +00:00
modmuss50
3131556ec8
Bump version, #releaseBuild 2016-12-20 14:09:13 +00:00
modmuss50
10ef977fd9
Fix ore dic names, closes #853 2016-12-20 14:08:15 +00:00
modmuss50
3e6fc0647f
Fix crash with certain mods, closes #854 2016-12-20 14:02:21 +00:00
modmuss50
ca98d7d8b8
Fixes Breaking Ruby ore, closes #856 and #855 2016-12-20 14:00:58 +00:00
modmuss50
bfcc3a2117
Initial work on IC2 de-duplication 2016-12-18 21:36:29 +00:00
Ourten
c8b3568a0c Unify TechReborn chests + Fix deep chests inventory drops 2016-12-18 22:06:07 +01:00
Ourten
da41ae7731 Apply QuantumChest fixes to DigitalChest 2016-12-18 21:34:01 +01:00
Ourten
baebc948d9 Add JEI integration for fluid generators recipes 2016-12-18 04:02:51 +01:00
Ourten
1d27182cc2 Fix FluidGenerators activation and energy production 2016-12-17 17:18:49 +01:00
Ourten
003d124667 Allow FluidGenerators to refill items with their tank 2016-12-17 16:22:31 +01:00
modmuss50
ce64156a9c
Bump version, #releaseBuild 2016-12-17 15:10:17 +00:00
modmuss50
75c82353fa
Fix #843, Some fluids dont have a texture so they wont render. 2016-12-17 15:07:03 +00:00
modmuss50
cb69f10c88
Fix Watermill missing texture, closes #841 2016-12-17 14:54:32 +00:00
Ourten
97192ee3f4 Add the unified FluidGenerator recipe system + Restructure FluidGenerators tiles
They should all be pretty now
2016-12-17 01:25:32 +01:00
Ourten
3bf346f39a Fix QuantumChest duplication bug and content sync 2016-12-16 21:44:32 +01:00
Ourten
f65999f960 Fix QuantumTank fluid updates 2016-12-16 15:11:46 +01:00
Modmuss50
aa7785706f Merge pull request #844 from Ourten/fix/energy-generators-2
More Energy Generators fixes
2016-12-15 17:07:26 +00:00
Ourten
1181ce49f2 Add tryAddingEnergy to ThermalGenerator to fix eternal activation with adjacent lava 2016-12-15 14:41:04 +01:00
Ourten
d727c2698b Add tryAddingEnergy method to SemifluidGenerator 2016-12-15 14:39:53 +01:00
Ourten
487fdeddcb Add activation state change for HeatGenerator + Cleanup side-check code 2016-12-15 14:39:27 +01:00
Ourten
a0e068cad4 Add tryAddingEnergy method to GasTurbine
This method will avoid blocking of the generator a little bit before it's max capacity
2016-12-15 14:36:48 +01:00
Ourten
8f0cc22472 Add activation state change to DragonEggSiphoner + Add convenient energy add method 2016-12-15 14:35:37 +01:00
modmuss50
c12d5aaf1e Bump version, #releaseBuild 2016-12-14 21:43:07 +00:00
Modmuss50
b67e08e267 Merge pull request #837 from Ourten/fix/energy-generators
Energy generators fix
2016-12-14 21:12:15 +00:00
Prospector
811d9edf54 Fix #836 2016-12-14 11:25:50 -08:00
Ourten
4c2a5b3f23 Add missing import in GasTurbine 2016-12-14 19:51:33 +01:00
Ourten
82ae50f5a8 Fix Semifluid generator activate state and fix fluid sync 2016-12-14 19:22:29 +01:00
Ourten
caf5d56e3c Fix GasTurbine activate state and fix fluid amount sync 2016-12-14 18:36:43 +01:00