Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions
1140 commits 8 branches 203 tags 97 MiB
Commit graph

565 commits

Author SHA1 Message Date
Johannes Gäßler
b9f8927b3d Made Automation tooltips more descriptive 
Adjusted allowPutStack, isInputFacing, isOutputFacing for the Item
Distributor
Adjusted onScrewdriverRightClick for the Item Regulator
 2017-07-01 11:29:27 +02:00
Johannes Gäßler
e1aafccce5 Added ItemDistributor crafting recipes, reordered ItemDistributor fields 2017-07-01 00:12:34 +02:00
Johannes Gäßler
72a7a2a4c3 Added a new texture for the Item Distributor 2017-06-30 23:18:44 +02:00
Johannes Gäßler
40d850aece Added the state of the ItemDistributor to the NBTTadCompound 2017-06-28 00:16:04 +02:00
Johannes Gäßler
95a1d46086 Added configurable weights to the ItemDistributor sides. 2017-06-27 00:44:59 +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
SLiMylya
cbefd59741 NEI GUI AssemblyLine 2017-06-24 09:51:59 +03: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
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
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
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
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
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
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
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