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 |
|
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
|
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 |
|
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
|
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 |
|
Techlone
|
5df32b69ab
|
Merge branch 'unstable' into advminer2_improvements
|
2017-06-04 21:31:08 +05:00 |
|
Techlone
|
dbd2f58008
|
Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable
|
2017-06-04 21:30:51 +05:00 |
|
Technus
|
c9908ffa98
|
wire/pipe hiding/reduced size
|
2017-06-04 09:28:43 +02:00 |
|
Technus
|
0db3a1d6df
|
Missing override
|
2017-06-04 09:25:46 +02:00 |
|
vlad20012
|
64a69695e5
|
Fixed stored energy integer overflow
|
2017-06-04 05:32:47 +03: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 |
|
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 |
|
Blood-Asp
|
e3b3fd66f1
|
Fix compressed meteoric iron recipe. #1071
|
2017-06-02 12:36:31 +02:00 |
|
Blood-Asp
|
18c92489fd
|
Update Modpack info
|
2017-06-02 12:17:56 +02:00 |
|
Blood-Asp
|
8342537d8c
|
Add newlines
|
2017-06-01 21:23:34 +02:00 |
|
Blood-Asp
|
dad36f6c48
|
Added links to Addons and modpacks to readme
|
2017-06-01 21:21:27 +02:00 |
|
Techlone
|
4f6bdedf96
|
Merge branch 'unstable' of https://github.com/Techlone/GT5-Unofficial into unstable
|
2017-06-01 23:09:27 +05:00 |
|
Techlone
|
067f4491a8
|
Merge branch 'unstable' into advminer2_improvements
|
2017-06-01 20:59:40 +05:00 |
|
Techlone
|
f2f74c09f9
|
Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable
|
2017-06-01 20:59:20 +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 |
|