Commit graph

2117 commits

Author SHA1 Message Date
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
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
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
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
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
modmuss50
29f40e1f98 Add plate recipes based of ore dic 2016-12-12 15:53:04 +00:00
modmuss50
27862b0a28 Add some more recipes listed in #818 2016-12-12 15:29:25 +00:00
modmuss50
7a4c7cfea9 Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11 2016-12-12 09:53:30 +00:00
modmuss50
71d8a3c7e8 Iron furnace now uses the same sides as the vanilla furnace, closes #622 2016-12-12 09:49:00 +00:00
modmuss50
59b7610227 Fix extractor recipe allowing any wood for sap extraction, close #381 again 2016-12-12 09:22:19 +00:00
ProfessorProspector
0273a619f1 Remove old jsondestroyer things 2016-12-11 23:03:51 -08:00
ProfessorProspector
a681fe4be6 Even more jsons: Cloaking device, electric treetap, lapotronic orbpack, lithium batpack, rockcutter, omnitool, manual, treetap, wrench, and refactor some model paths 2016-12-11 23:00:08 -08:00
ProfessorProspector
b3988e4c4f Register cables in preinit, and switch cable items and storage blocks to jsons 2016-12-11 22:25:27 -08:00
ProfessorProspector
14c2b540f2 Modify galena texture 2016-12-11 22:12:52 -08:00
ProfessorProspector
e6ba58eb45 Fusion Coils now use jsons 2016-12-11 18:22:35 -08:00
ProfessorProspector
7379e32a17 Ores use json 2016-12-11 18:05:03 -08:00
ProfessorProspector
49f227ca81 MORE JSONS: UU matter, upgrades, scrapboxes, and rubber sapling! Also fix rubber sapling model 2016-12-11 17:27:39 -08:00
ProfessorProspector
257a838c2c couple more langs 2016-12-11 16:48:30 -08:00
ProfessorProspector
7b5c6a6102 Fix some lang and models 2016-12-11 16:47:28 -08:00
ProfessorProspector
8012abee3b Move dusts and smalldusts to json 2016-12-11 11:34:56 -08:00
ProfessorProspector
3da6083c68 Nuggets now use jsons, and nuggets now return proper subtypes 2016-12-11 10:58:20 -08:00
ProfessorProspector
718fc53bbd Let players set freq. transmitter to interactive block (shift click no longer clears on blocks) and unify tooltip 2016-12-11 10:07:56 -08:00
ProfessorProspector
ab1b1ca409 Fix #829 hopefully 2016-12-10 22:53:02 -08:00
ProfessorProspector
03b0aef687 slight adjustment #betaBuild 2016-12-10 21:56:00 -08:00
ProfessorProspector
86b98cab13 Unify tooltip messages, fix cable subtypes, and fix ruby drops 2016-12-10 18:13:27 -08:00
ProfessorProspector
61de7101c3 TOP support now changes colours based on energy system config 2016-12-10 17:15:30 -08:00
ProfessorProspector
5186f3d0ae #releaseBuild 2016-12-10 15:04:24 -08:00
ProfessorProspector
9e3372c5aa remove debug line 2016-12-10 15:00:53 -08:00
ProfessorProspector
d510b24599 Fix improper plate ore dictionary entries 2016-12-10 15:00:20 -08:00