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
SLiMylya
cbefd59741
NEI GUI AssemblyLine
2017-06-24 09:51:59 +03:00
Johannes Gäßler
41b93ae85d
Fixed several Material formulas
...
RedAlloy, TungstenCarbide now have the correct formula.
Changed the formula of Lignite, it no longer contains Ash
Fixed the algorithm for determining whether or not to put brackets
around a partial Material.
2017-06-23 00:54:16 +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
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
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
Blood-Asp
b588e82ef7
Fix buffer and regulator RS signals
2017-06-16 01:40:16 +02:00
Blood-Asp
a1e3a8161e
Hitboxes when holding soldering iron #1095
2017-06-15 23:52:32 +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
911a807529
pollution smog
2017-06-14 23:51:39 +02:00
Blood-Asp
e6de8921c0
fix for timber changes
2017-06-14 01:30:36 +02:00
Blood-Asp
9447eea43b
why does the client crash when using isClientSide() ???
2017-06-14 01:02:49 +02:00
Blood-Asp
61d17d250d
quickfix for server side crash
2017-06-14 00:00:58 +02:00
Blood-Asp
4ac668066b
missed one file
2017-06-13 22:50:19 +02:00
Blood-Asp
699ea26ba4
Attempt to fix not accepting fluids after fluidmapchange. #1081 #577 ect.
2017-06-13 22:41:15 +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
1b753d3528
Reworking DataOrb and DataStick
2017-06-13 20:52:53 +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
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
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
589a77c5cb
Check general redstoneoutput for null
2017-06-06 16:19:45 +02:00
Blood-Asp
c1f85264a0
Add missing translation lines. #772
2017-06-05 20:45:15 +02:00
Technus
71aeac25b9
Missing in item pipe
2017-06-05 15:03:34 +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
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
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
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
Techlone
067f4491a8
Merge branch 'unstable' into advminer2_improvements
2017-06-01 20:59:40 +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
Technus
a4f0426159
8e0e516
2017-06-01 13:22:10 +02:00
Technus
a99e0d4ffb
Not needed.
2017-06-01 13:19:27 +02:00
Technus
82458fed2e
Cherry-Pick c12e474
...
c12e474c23
2017-06-01 13:18:34 +02:00
JohannesGaessler
7eb176f3a2
Merge branch 'unstable' into ChemistryUpdate
2017-06-01 10:22:10 +02:00
Blood-Asp
94f8581477
Fix multiblock recipe search fix #1044
2017-05-31 21:52:58 +02:00
Blood-Asp
b047ab56b2
Fix spelling #1043
2017-05-31 21:42:32 +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
3f73fa9b86
Merge pull request #1058 from Georggi/patch-4
...
Auto Maintenance Hatch tweaks
2017-05-31 18:57:39 +02:00
