Techlone
a19e8b10eb
Merge branch 'advminer2_improvements' of https://github.com/Techlone/GT5-Unofficial into advminer2_improvements
2017-06-07 18:14:15 +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
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
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
Technus
8293ac9d5c
this actually changes the raytracer boxes reusing the collision boxes
2017-06-05 15:23:37 +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
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
Techlone
5df32b69ab
Merge branch 'unstable' into advminer2_improvements
2017-06-04 21:31:08 +05:00
Technus
c9908ffa98
wire/pipe hiding/reduced size
2017-06-04 09:28:43 +02:00
Blood-Asp
30de32fb07
Monocrystalline Silicon Boule
2017-06-04 00:28:53 +02:00
Blood-Asp
23de1f09ed
Cleanroom controller outputs efficency as redstone signal #948
2017-06-04 00:26:31 +02:00
Technus
467e6ba022
1ddc91a
2017-06-03 16:11:59 +02:00
Blood-Asp
9a3fa2e42c
Fix Pollution bug
2017-06-03 13:42:41 +02:00
Johannes Gäßler
8a19bd9fc9
Increased the input slots of the assembler from 2 to 6.
2017-06-03 12:45:20 +02:00
Techlone
c5402ee389
Some ODP fixes, energy checking, add radius in tooltip, add "missing pipes" message for II-IV tiers
...
change build.gradle for debugging in IDEA
2017-06-02 22:18:29 +05:00
Blood-Asp
b0049786b7
Make Casings and reinforced blocks transfer redstone signals
2017-06-02 18:15:29 +02:00
Johannes Gäßler
63a5d1dad7
Added methods for adding Distillery recipes with a solid output.
...
Universal Distillation recipes now utilize the solid output.
Fixed the chemical formula for Tetranitromethane and fluid name for
NitroDiesel
2017-06-01 22:59:06 +02:00
Techlone
067f4491a8
Merge branch 'unstable' into advminer2_improvements
2017-06-01 20:59:40 +05:00
Techlone
7c48590a49
OreDrill state saving
2017-06-01 20:58:24 +05:00
Techlone
75a33be210
Fix OreDrill; fix getting block in ItemList; some changes in addInformation - need check this
2017-06-01 20:23:13 +05:00
Blood-Asp
7ddf9c5f4e
Teleporter and Energy Transmitter fixes
2017-06-01 13:28:05 +02:00
Daniel
0a928887ed
Cleanup and some commentary
2017-06-01 13:24:02 +02:00
Daniel
8b1e6d55be
7bd71fe
2017-06-01 13:23:51 +02:00
Daniel
28694dac93
Fix that so pollution is not negative.
2017-06-01 13:22:27 +02:00
Technus
a4f0426159
8e0e516
2017-06-01 13:22:10 +02:00
Technus
82458fed2e
Cherry-Pick c12e474
...
c12e474c23
2017-06-01 13:18:34 +02:00
Technus
7a08da6a06
that makes it look better?
2017-06-01 12:01:20 +02:00
Technus
427b1e105a
Why does one change the machine state TWICE in the same tick...
2017-06-01 12:00:52 +02:00
JohannesGaessler
7eb176f3a2
Merge branch 'unstable' into ChemistryUpdate
2017-06-01 10:22:10 +02:00
Blood-Asp
9a69e1978d
Fix comb processing recipes #1052
2017-05-31 22:57:21 +02:00
Blood-Asp
4c17c2beff
Make Internal wireless redstone work as machine controller
2017-05-31 21:37:26 +02:00
Techlone
19f7074897
Merge branch 'unstable' into advminer2_improvements
2017-06-01 00:02:13 +05:00
Techlone
b187410005
AdvMiner rewriting; now it's Ore Drilling Plant
...
Four tiers of Ore Drilling Plant
I - radius is 3 chunks MV+ (default)
II - radius is 4 chunks HV+
III - radius is 6 chunks EV+
IV - radius is 9 chunks IV+
New behavior:
- pick pipes after mining finish
- extract ore block before moving down
2017-06-01 00:01:32 +05:00
Blood-Asp
5386a69022
Merge pull request #1051 from JohannesGaessler/unstable
...
[5.09.29] EBF recipe fix followup
2017-05-31 18:58:06 +02:00
Blood-Asp
3f73fa9b86
Merge pull request #1058 from Georggi/patch-4
...
Auto Maintenance Hatch tweaks
2017-05-31 18:57:39 +02:00
Blood-Asp
b170cd5a5c
Merge pull request #1067 from antifluxfield/unstable
...
Wrong behavior of Player Detector
2017-05-31 18:55:35 +02:00
Blood-Asp
1af33411d2
Disable switching armor gui because of broken sync
2017-05-31 18:53:56 +02:00
Blood-Asp
40304ed2f5
Catch login armor crash
2017-05-31 18:09:30 +02:00
Johannes Gäßler
38bfbabd58
Fixed a bug where the LCM could have a mMaxProgressTime of zero.
2017-05-30 10:21:46 +02:00
