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
Ourten
65ec0db2de
Fix ThermalGenerator logic and packet updates
...
There is one bug left, the displayed liquid stack is always air.
2016-12-14 17:43:33 +01:00
modmuss50
57720c61de
Fix Iridum Recipe, fixes #792
2016-12-14 10:10:07 +00:00
modmuss50
32785e4f5b
Fix multiblocks, add holo renderer back, closes #802 #833 #768
2016-12-14 10:03:54 +00:00
modmuss50
4f8bfcb2df
Fix missing textures on some blocks
2016-12-14 09:41:11 +00:00
modmuss50
ccdb5c0761
Fix merge issues, fix build
2016-12-14 09:28:05 +00:00
modmuss50
c1d2e875bf
Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11
...
# Conflicts:
# build.gradle
# src/main/java/techreborn/blocks/BlockRubberLog.java
# src/main/java/techreborn/init/ModRecipes.java
# src/main/java/techreborn/items/tools/ItemElectricTreetap.java
# src/main/java/techreborn/items/tools/ItemTreeTap.java
2016-12-14 09:23:24 +00:00
modmuss50
47df52a7f2
Improve power transfur between items, closes https://github.com/TechReborn/TechReborn/issues/835
2016-12-14 09:13:30 +00:00
Modmuss50
5eac54b523
Merge pull request #834 from Ourten/feature/jei-grinder-fluid
...
Add fluidstack info to jei recipe for IndustrialGrinder
2016-12-14 08:00:42 +00:00
Ourten
abcef5aace
Add fluidstack info to jei recipe for IndustrialGrinder
2016-12-14 02:08:22 +01:00
modmuss50
ee96908775
Disable recipe, to fix crash with a certain set of mods. #releaseBuild
2016-12-13 19:19:12 +00:00
Thomas Guillemard
ebf569a906
Make treetap working with the IC2 rubber tree ( Fix #786 ) ( #831 )
...
Changes:
- The dependency of IC2 have been updated to the last version
- This implementation follow the original treetap logic but use
Techreborn original electrical cost.
2016-12-13 16:24:38 +00:00
modmuss50
601194685b
Merge 1.10 changes, bump version for #releaseBuild
2016-12-13 11:53:33 +00:00
modmuss50
a3b4e9de6e
Merge 1.10, bump version for #releaseBuild
2016-12-13 11:51:33 +00:00
modmuss50
40852ca113
Bump version, #releaseBuild
2016-12-13 11:48:21 +00:00
ProfessorProspector
3378c910a3
Fix lang
2016-12-12 16:05:32 -08:00
ProfessorProspector
c271422e11
Remove deprecated empty cell
2016-12-12 15:57:04 -08:00
ProfessorProspector
de5ebf5ae3
Merge branch '1.11' of https://github.com/TechReborn/TechReborn into 1.11
2016-12-12 15:44:33 -08:00
ProfessorProspector
764396d7ef
ALL ITEMS USE JSON NOW \o/
2016-12-12 15:44:16 -08:00
modmuss50
0d7e26e74a
Remove log, and add small dusts to ore dict
2016-12-12 17:54:20 +00:00
