Blood-Asp
c665b14e22
Merge pull request #1088 from Techlone/reworking_dataorb
...
Reworking DataOrb and DataStick
2017-06-13 18:55:33 +02:00
Techlone
156bb2b06b
Tooltips changing
2017-06-13 21:09:48 +05:00
Techlone
1b753d3528
Reworking DataOrb and DataStick
2017-06-13 20:52:53 +05:00
Techlone
c8a8687a72
Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable
2017-06-13 17:44:23 +05:00
Techlone
bfd3ff4b19
Merge branch 'unstable' of https://github.com/Techlone/GT5-Unofficial into unstable
2017-06-13 17:44:13 +05:00
Blood-Asp
e85a761e82
At last one free face.
2017-06-12 13:48:54 +02:00
Blood-Asp
ef22bf6ab9
Only open machine gui if front is free.
2017-06-12 12:18:54 +02:00
Blood-Asp
8e043d00d9
Cables and pipes now change hitboxes dynamicly depending on connections or covers
2017-06-12 11:58:26 +02:00
Blood-Asp
e0cd4376b1
change back the component heat exchanger damage value
2017-06-12 11:34:25 +02:00
Johannes Gäßler
c9277a3a7e
Fixed Chloromethane and Chloroform recipes missing empty cell outputs
2017-06-12 00:33:42 +02:00
Johannes Gäßler
b3e0b41ee6
Changed the Primitive Blast Furnace so that it uses the new Recipe Map
2017-06-11 18:52:08 +02:00
Blood-Asp
30b6d22d81
Merge pull request #1083 from Techlone/unstable
...
More fixes for the world gen
2017-06-10 23:41:41 +02:00
Johannes Gäßler
7982374b38
Added a Recipe Map for Primitive Blast Furnaces
...
The Recipe Map is not yet in use.
2017-06-10 11:05:27 +02:00
Johannes Gäßler
74c41614a5
Fixed Silicone Rubber recipe, nerfed Silicone Rubber, added DT desc.
...
Made it so that GT_Values.NI and GT_Values.NF are consistently used when
applicable.
Nerfed Silicone Rubber so that you only get 3/7 as much as from a
regular plastic.
The idea is that Silicone Rubber is more versatile than PVC or SBR, but
also more expensive.
Changed the Distillation Tower description so that it aligns with the
new behavior.
2017-06-09 00:14:55 +02:00
Johannes Gäßler
6d15192990
Implemented Bricked Blast Furnace, added corresponding textures
...
Added a new Casing for the Bricked Blast Furnace, GT_Block_Casings4, ID
15
Refactored the non-electric Blast Furnaces:
The Bronze Blast Furnace and the Bricked Blast Furnace extend a
superclass to ensure consistent behavior.
Subclasses only differ in texture, description, and Casing Block.
2017-06-08 23:22:08 +02:00
Techlone
d7debfd34e
fix wrong center chunk coordinates
2017-06-08 21:27:24 +05:00
Techlone
8172e2ef60
Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable
2017-06-08 20:42:06 +05:00
Blood-Asp
0a375ac948
experimental worldgen change fix
2017-06-07 19:00:15 +02:00
Techlone
541144f443
formatting
2017-06-07 18:19:50 +05:00
Techlone
86318b7b44
Merge branch 'unstable' into advminer2_improvements
...
# Conflicts:
# src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
2017-06-07 18:17:23 +05:00
Techlone
a19e8b10eb
Merge branch 'advminer2_improvements' of https://github.com/Techlone/GT5-Unofficial into advminer2_improvements
2017-06-07 18:14:15 +05:00
Techlone
38e12d554c
Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable
2017-06-07 18:13:47 +05:00
Blood-Asp
9032c2e15b
Quick fixes
2017-06-07 09:45:19 +02:00
Blood-Asp
1296755b27
Merge branch 'refs/heads/pr/1077' into unstable
...
# Conflicts:
# src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java
2017-06-07 09:37:13 +02:00
Blood-Asp
3b1f55fcb9
Merge pull request #1076 from vlad20012/int-overflow-fix
...
Fixed stored energy integer overflow
2017-06-07 09:30:04 +02:00
Johannes Gäßler
785322f5c7
Rebalanced Fermented Biomass in face of the Methane Fuel Value change
...
Now also yields Fertilizer, Ammonia, and Carbon Dioxide.
2017-06-07 00:40:19 +02:00
Blood-Asp
425a6d1cea
forgot to commit the oredict changes
2017-06-06 23:58:30 +02:00
Blood-Asp
688e6eb122
Porting of GT6 prospection + Marble/Basalt compatibility, more oredicts for marble/basalt, chisel compat #1050
2017-06-06 23:57:33 +02:00
Johannes Gäßler
1d636be525
Fixed a bug where the order of DT fluid outputs was actually reversed
2017-06-06 20:27:20 +02:00
Johannes Gäßler
9295a4202a
Changed the ID of the LCM again because of GTNH collision: 1200 -> 1169
2017-06-06 18:23:11 +02:00
Blood-Asp
589a77c5cb
Check general redstoneoutput for null
2017-06-06 16:19:45 +02:00
Blood-Asp
530a334bb1
Fix Nitric Acid name #1079
2017-06-06 15:32:06 +02:00
Blood-Asp
d9a318678c
Correcting Steel Boiler Tooltip #1080
2017-06-06 13:00:11 +02:00
Blood-Asp
b4b8820373
Fix vents as covers. Ventcovers now speed up machines 1-3% #1065
2017-06-06 00:07:09 +02:00
Blood-Asp
d26d9e1045
Attempt to prevent worldgen loops with other mods #1063 #828
2017-06-05 23:30:53 +02:00
Blood-Asp
4c25e83b0d
Improved large boiler tooltip #877
2017-06-05 21:07:23 +02:00
Blood-Asp
c1f85264a0
Add missing translation lines. #772
2017-06-05 20:45:15 +02:00
Johannes Gäßler
c7704610c5
Added Rape Crop as a new source of Seed Oil
2017-06-05 16:50:02 +02:00
Techlone
3fa72fd1f1
Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable
2017-06-05 18:57:11 +05:00
Technus
e4b28e6208
Thiccness changes done
2017-06-05 15:36:02 +02:00
Technus
b3d49a8c96
Adjust pipe thiccnes
2017-06-05 15:30:43 +02:00
Technus
8293ac9d5c
this actually changes the raytracer boxes reusing the collision boxes
2017-06-05 15:23:37 +02:00
Technus
71aeac25b9
Missing in item pipe
2017-06-05 15:03:34 +02:00
Techlone
7cb51ae461
fix OsmiridiumCasing recipe in Assembler
...
fix ODP changing state when the tip meets itself
fix cleaning of oreBlockPositions when a mining column was broken
2017-06-05 17:14:24 +05:00
Johannes Gäßler
364b4bc3ae
Implemented Bio Diesel, Glyceryl Trinitrate, adjusted alcohol fuel value
...
Bio Diesel can be produced from Seed Oil or Fish Oil.
Bio Diesel Production yields Glyceryl as a byproduct, which can be used
for Dynamite production.
Alcohols have their fuel value reduced by 20000 per Oxygen atom
Increased the potency of Dynamite in the Implosion Compresser so that
dynamite recipes actually show up.
In return Dynamite now needs more Glyceryl Trinitrate: 150 -> 500
2017-06-05 12:25:33 +02:00
Johannes Gäßler
8db4738e81
Made it so that rubber-related recipes accept more than one rubber type
...
LV, MV, HV recipes accept all rubbers.
EV+ recipes accept only synthetic rubbers.
Affected items: Pump, Conveyor Module, Plunger,
Because it is not easily possible to have this functionality for the
Assembly Line, the Assembly Line still accepts only one type of rubber
for each recipe.
2017-06-05 00:13:29 +02:00
Johannes Gäßler
3ec9ddf346
Changed the MetaGeneratedItem ID of the Large Chem Reactor: 1177 -> 1200
2017-06-04 21:59:12 +02:00
Johannes Gäßler
e42ddd911a
Merge branch 'ChemistryUpdate' of https://github.com/JohannesGaessler/GT5-Unofficial into ChemistryUpdate
2017-06-04 20:31:28 +02:00
Johannes Gäßler
d0247a5d73
Moved the casing IDs for the Large Chemical Reactor: 14, 15 -> 4, 5
...
Limited the minimal recipe time for the LCM to 2 ticks to avoid bugs.
2017-06-04 20:19:07 +02:00
Blood-Asp
e102488f2c
More redstone changes
2017-06-04 19:11:03 +02:00
