YoungGT
|
6eb089d42b
|
Update zh_CN.lang
|
2017-09-10 20:41:46 +08:00 |
|
YoungGT
|
2eac4d9fa2
|
Update zh_CN.lang
|
2017-09-05 06:47:13 +08:00 |
|
YoungGT
|
9c9d915d51
|
Update zh_CN.lang
|
2017-09-04 22:19:42 +08:00 |
|
Blood-Asp
|
ec1460d2da
|
Merge pull request #1184 from GTNewHorizons/texture_overhaul
Texture overhaul
|
2017-09-03 15:54:24 +02:00 |
|
Blood-Asp
|
a377bcea63
|
Merge pull request #1170 from JohannesGaessler/PyrometallurgyUpdate
Pyrometallurgy update
|
2017-09-03 15:46:19 +02:00 |
|
Blood-Asp
|
23cbb42266
|
Merge pull request #1199 from Antifluxfield/patch-5
Multi-lines tooltip support
|
2017-09-03 14:56:01 +02:00 |
|
Blood-Asp
|
edba8167b6
|
Merge branch 'unstable' into patch-5
|
2017-09-03 14:55:30 +02:00 |
|
Blood-Asp
|
4f73a6b726
|
Merge pull request #1197 from JohannesGaessler/FluidCannerCostReduction
Fluid Canner cost reduction
|
2017-09-03 14:50:26 +02:00 |
|
Blood-Asp
|
30daf05176
|
Merge pull request #1195 from Techlone/fix_inconsistent_wordgen
Fix inconsistent worldgen
|
2017-09-03 14:49:29 +02:00 |
|
Blood-Asp
|
471ed5c9ea
|
Merge pull request #1193 from Antifluxfield/patch-4
Improve fluid regulator
|
2017-09-03 14:45:38 +02:00 |
|
Blood-Asp
|
21bb9c8c8d
|
Merge pull request #1192 from Antifluxfield/patch-3
Fix the Generated Item Pipes
|
2017-09-03 14:44:40 +02:00 |
|
Blood-Asp
|
0819ea5da7
|
Merge pull request #1191 from Antifluxfield/patch-2
Fix the Tooltip of Pumps
|
2017-09-03 14:44:01 +02:00 |
|
Blood-Asp
|
dc2a6073f0
|
Merge pull request #1174 from Dimach/unstable-3
Added new function to GT scanner
|
2017-09-03 14:43:42 +02:00 |
|
Blood-Asp
|
ef4a2d48a6
|
Merge pull request #1168 from Antifluxfield/patch-1
Correct description of regulator
|
2017-09-03 14:40:19 +02:00 |
|
Blood-Asp
|
2555acf75f
|
Merge pull request #1147 from SLiMylya/addnewbattery
Add new zpm and uv battery
|
2017-09-03 14:38:59 +02:00 |
|
Antifluxfield
|
eb749f64ca
|
Use "/n " as seperator
|
2017-08-21 21:38:39 +08:00 |
|
Antifluxfield
|
f6482e63ae
|
Use "/n " as seperator
|
2017-08-21 21:28:37 +08:00 |
|
Johannes Gäßler
|
f94d61a3d2
|
Fixed Large Chemical Reactor GUI, was wrongly using default before
|
2017-08-21 08:56:24 +02:00 |
|
Johannes Gäßler
|
97fc717f9a
|
Fixed LCM desulfurization recipes in combination with CirChemUpdateFU
|
2017-08-21 08:42:24 +02:00 |
|
Antifluxfield
|
d5b0dcfa50
|
Multi-line tooltip of #1193
|
2017-08-21 09:59:47 +08:00 |
|
Antifluxfield
|
78e03914a3
|
Improve tooltip
Now the metaitems can automatically seperate its tooltip to multiple lines with "////".
|
2017-08-21 09:56:04 +08:00 |
|
Johannes Gäßler
|
3b39210348
|
Fixed desulfuriation recipes colliding with hydro-cracking recipes
|
2017-08-20 10:15:25 +02:00 |
|
Johannes Gäßler
|
1c8df8fb7f
|
Fixed Titaniumtetrachloride temperature
|
2017-08-19 23:56:48 +02:00 |
|
Johannes Gäßler
|
c281488927
|
Merge branch 'unstable' into PyrometallurgyUpdate
Conflicts:
src/main/java/gregtech/GT_Mod.java
src/main/java/gregtech/api/enums/Materials.java
src/main/java/gregtech/common/GT_Proxy.java
src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java
src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
|
2017-08-19 23:46:31 +02:00 |
|
Johannes Gäßler
|
d294ba9773
|
Reduced the cost of Fluid Canners
Circuits: 2 -> 1
Pumps: 2 -> 1
Glass: 2 -> 4
|
2017-08-19 11:46:52 +02:00 |
|
Johannes Gäßler
|
e8c75a54ee
|
Fixed Steam Macerators using constant EUt, recipe time
|
2017-08-19 11:32:29 +02:00 |
|
Antifluxfield
|
4724bbe403
|
Adding tooltip
|
2017-08-19 12:08:34 +08:00 |
|
Techlone
|
ec0767d4fd
|
Fix inconsistent worldgen
|
2017-08-19 03:17:14 +05:00 |
|
Muramasa-
|
87cdb8ac00
|
Fix use of RedstoneAlloy resulting in broken recipe
|
2017-08-17 23:28:31 +01:00 |
|
Antifluxfield
|
6691f1e86c
|
Update GT_Cover_FluidRegulator.java
Improve the screwdriver-rightclick behavior.
|
2017-08-17 14:51:45 +08:00 |
|
Antifluxfield
|
4b36ca77be
|
Fix the Generated Item Pipes
Correct the factor.
|
2017-08-16 16:23:08 +08:00 |
|
Antifluxfield
|
c09f6b5bdd
|
Fix Tooltip of Pump
Add the missing bracket
|
2017-08-16 13:14:23 +08:00 |
|
Technus
|
8eade43a19
|
Fix NPE, GREG why u no crash game!
|
2017-08-12 15:08:25 +02:00 |
|
Muramasa-
|
9fc5d17eb5
|
Pump tooltips
|
2017-08-12 02:21:09 +01:00 |
|
Muramasa-
|
14a7d0768f
|
Show dim id with scanner
|
2017-08-11 23:04:33 +01:00 |
|
Muramasa-
|
8b85da877d
|
implements #1061
|
2017-08-11 22:52:51 +01:00 |
|
Muramasa-
|
eb24bee24b
|
Some tooltip info #1183
|
2017-08-11 22:08:49 +01:00 |
|
Muramasa-
|
d58cece573
|
maybe correct #1137
|
2017-08-11 21:19:55 +01:00 |
|
Blood-Asp
|
a7c5d30146
|
Merge pull request #1172 from JohannesGaessler/MoreItemPipeMaterials
More Item Pipe Materials
|
2017-08-11 21:24:48 +02:00 |
|
Blood-Asp
|
d4ea25e1bc
|
Merge pull request #1171 from JohannesGaessler/PyrolyzeOvenCoilScaling
Pyrolyse oven coil scaling
|
2017-08-11 21:20:08 +02:00 |
|
Blood-Asp
|
ff7396509b
|
Merge pull request #1176 from Dimach/unstable-4
Added new info to batbuffer nuclear control panel and fixed bug
|
2017-08-11 21:14:08 +02:00 |
|
Blood-Asp
|
1b1f96dcd9
|
Merge pull request #1162 from JohannesGaessler/CrackingBalanceFollowup
Cracking Balance Followup
|
2017-08-11 15:18:10 +02:00 |
|
Blood-Asp
|
9962e826a7
|
Merge pull request #1159 from JohannesGaessler/AshRebalance
Ash rebalance
|
2017-08-11 15:16:16 +02:00 |
|
Blood-Asp
|
42094fdf46
|
Merge pull request #1158 from JohannesGaessler/StoneDustRebalance
Stone Dust Rebalance
|
2017-08-11 15:07:05 +02:00 |
|
Blood-Asp
|
2c50b0a825
|
Merge pull request #1157 from Dimach/unstable-1
Fixed bug - isAllowedToPutIntoSlot don't check size of inventory.
|
2017-08-11 14:54:23 +02:00 |
|
Blood-Asp
|
c0da1931dd
|
Merge pull request #1156 from Antifluxfield/distillery-recipe-fix-alt
Another Distillery recipe fix
|
2017-08-11 14:33:27 +02:00 |
|
Blood-Asp
|
4ae02f55c8
|
Merge pull request #1153 from JohannesGaessler/MultiblockFluidIOFix
Multiblock Fluid IO fix
|
2017-08-11 14:24:37 +02:00 |
|
Blood-Asp
|
987d1ec11e
|
Merge pull request #1149 from joakibj/fix-orebasalticmineralsand
Fix oreBasalticMineralSand properly being mapped to "ore" prefix
|
2017-08-11 14:21:03 +02:00 |
|
Blood-Asp
|
46420e73cb
|
Merge pull request #1144 from Dimach/unstable
Fixed coloring of pyrolyse oven.
|
2017-08-11 14:19:10 +02:00 |
|
Johannes Gäßler
|
a749a8536f
|
Reverted changes to Mercury Ore Washing.
|
2017-08-07 23:12:27 +02:00 |
|