Technus
29c2639e83
Add refreshing code
2017-06-25 12:19:03 +02:00
Technus
6abdc95c0c
Optimize imports - intelliJ one button action
2017-06-25 12:09:46 +02:00
Technus
9beb1b5b31
Assline recipes part1
2017-06-25 11:42:48 +02:00
Daniel
b7a339d63e
Revert "NEI GUI AssemblyLine"
2017-06-25 10:42:39 +02:00
Johannes Gäßler
22fdaed164
Added simple ItemDistributor implementation, changed MoveOneItemStack
2017-06-25 00:30:59 +02:00
Johannes Gäßler
31516ba891
Created a non-functional first draft of the Item Distributor
2017-06-24 18:08:23 +02:00
Johannes Gäßler
6f3d92f3fa
Added a config option for easier EV+ Cables
2017-06-24 11:56:35 +02:00
SLiMylya
cbefd59741
NEI GUI AssemblyLine
2017-06-24 09:51:59 +03:00
Johannes Gäßler
c0c498fb8c
Added Bricked BF config, fixed Primitive BF class hierarchy
...
Blast Furnace Recipes using Coal or Charcoal now yield Dark Ash instead
of Ash.
2017-06-23 23:48:38 +02:00
Johannes Gäßler
14b9332d14
Moved the Casings for the Large Chemical Reactor again.
...
As it turns out overwriting Casings 4.4 and 4.5 was not a good idea
because even though there is no actual Casing at those IDs, the textures
are in use.
I started a new batch of Casings (GT_Block_Casings8) at IDs 112-127.
I did not use IDs 80-95 because there seem to already be some textures
there.
I did not use IDs 96-111 because they seem to already be in use by
Technus.
2017-06-22 01:50:21 +02:00
Johannes Gäßler
668ca431a8
Merge remote-tracking branch 'origin/unstable' into OilRefining
...
Conflicts:
src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-18 17:26:04 +02:00
Johannes Gäßler
337b6fc66d
Merge branch 'ChemistryUpdate' into unstable
...
Conflicts:
src/main/java/gregtech/api/enums/ItemList.java
src/main/java/gregtech/api/enums/Textures.java
src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-18 00:17:03 +02:00
Johannes Gäßler
b73a2e0017
Implemented crafting recipes for the Bricked Blast Furnace
...
fixed Glass Hammering consuming 40x more energy than intended
Fixed Hammer recipes that (presumably unintentionally) had 10EUt, 16
ticks instead of 16EUt, 10 ticks.
Renamed Dense Bricks -> Firebricks
2017-06-17 23:39:51 +02:00
Blood-Asp
edc857c8a9
Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable
2017-06-17 14:38:20 +02:00
Blood-Asp
617f057dad
Extended logging for Assemblyline
2017-06-17 14:37:57 +02:00
Blood-Asp
909149cd28
Merge pull request #1074 from Techlone/advminer2_improvements
...
AdvMiner2 renamed; new tiers of OreDrillingPlant
2017-06-17 14:37:10 +02:00
Johannes Gäßler
a739167c7f
Fixed Imp. Compressor Dynamite amount possibly becoming zero
2017-06-17 12:04:33 +02:00
Johannes Gäßler
de42d1da42
Merge remote-tracking branch 'GT5-Unofficial-Fork/ChemistryUpdate' into
...
BrickedBlastFurnace
Conflicts:
src/main/java/gregtech/api/enums/Materials.java
src/main/java/gregtech/api/enums/Textures.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-17 01:02:38 +02:00
Johannes Gäßler
fcaefe2d28
Adjusted BBF GUIs to accommodate to the new 3/3 layout.
2017-06-16 23:48:36 +02:00
Johannes Gäßler
da83199523
Added Interface classes for the BBF, increased slots to 3/3
2017-06-16 21:26:20 +02:00
Blood-Asp
650a105e00
Fix hiding of unused ores. #1062
2017-06-15 23:49:16 +02:00
Johannes Gäßler
34474480f7
Merge remote-tracking branch 'origin/unstable' into ChemistryUpdate
...
Conflicts:
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
src/main/java/gregtech/loaders/load/GT_FuelLoader.java
src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
2017-06-15 12:28:14 +02:00
Blood-Asp
08c75fd813
Improve fog density calculation
2017-06-15 00:28:27 +02:00
Blood-Asp
911a807529
pollution smog
2017-06-14 23:51:39 +02:00
Johannes Gäßler
91fb725a47
Fixed a bug where an Assembler recipe would be added if the output is
...
null
2017-06-14 22:24:31 +02:00
Draknyte1
d1eea59fe7
Made the Cleanroom optional.
...
This disables the Low Grav option if the Cleanroom is disabled.
2017-06-14 18:55:26 +10:00
Blood-Asp
96b1cb31ce
improve cleanroom tooltip
2017-06-14 02:16:18 +02:00
Blood-Asp
e6de8921c0
fix for timber changes
2017-06-14 01:30:36 +02:00
Blood-Asp
c397df4523
make reinforced blocks prevent monsterspawns
2017-06-14 01:19:56 +02:00
Blood-Asp
e30a5694ff
wood plank compressor recipe #1013
2017-06-13 23:10:49 +02:00
Blood-Asp
3caab8d4ff
Fix translation of covers
2017-06-13 21:48:10 +02:00
Blood-Asp
9209d0843f
Port GT6 timber changes
2017-06-13 18:58:18 +02:00
Blood-Asp
ead3fa6ad7
meh...
2017-06-13 18:57:05 +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
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
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
Blood-Asp
0a375ac948
experimental worldgen change fix
2017-06-07 19:00:15 +02: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
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
