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

1317 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Techlone
8172e2ef60 Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable 2017-06-08 20:42:06 +05:00
Blood-Asp
0a375ac948 experimental worldgen change fix 2017-06-07 19:00:15 +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
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
Johannes Gäßler
785322f5c7 Rebalanced Fermented Biomass in face of the Methane Fuel Value change 
Now also yields Fertilizer, Ammonia, and Carbon Dioxide.
 2017-06-07 00:40:19 +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
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
Johannes Gäßler
c7704610c5 Added Rape Crop as a new source of Seed Oil 2017-06-05 16:50:02 +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
364b4bc3ae Implemented Bio Diesel, Glyceryl Trinitrate, adjusted alcohol fuel value 
Bio Diesel can be produced from Seed Oil or Fish Oil.
Bio Diesel Production yields Glyceryl as a byproduct, which can be used
for Dynamite production.

Alcohols have their fuel value reduced by 20000 per Oxygen atom

Increased the potency of Dynamite in the Implosion Compresser so that
dynamite recipes actually show up.
In return Dynamite now needs more Glyceryl Trinitrate: 150 -> 500
 2017-06-05 12:25:33 +02:00
Johannes Gäßler
8db4738e81 Made it so that rubber-related recipes accept more than one rubber type 
LV, MV, HV recipes accept all rubbers.
EV+ recipes accept only synthetic rubbers.

Affected items: Pump, Conveyor Module, Plunger,

Because it is not easily possible to have this functionality for the
Assembly Line, the Assembly Line still accepts only one type of rubber
for each recipe.
 2017-06-05 00:13:29 +02: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
Johannes Gäßler
f67dd9ce51 Fixed a bug where foils were missing for some cable Materials. 2017-06-04 16:05:35 +02:00
Johannes Gäßler
254e53a881 Implemented Polyphenylene Sulfide, Sodium Persulfate, made NaOH a solid 
Removed the previously added Material AnyDielectric because it cannot be
sensibly used.

Added Polydimethylsiloxane, Polystyrene, and Styrene-Butadiene Rubber to
the list of Materials with plastic-like local names.
Added foils for Polyvinylchloride, Styrene-Butadiene Rubber.

Fixed a bug where foils were missing for Polyvinyl Chloride
 2017-06-04 15:57:25 +02: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
Johannes Gäßler
7e07c88383 Made rubber consistent, rewrote WireProcessing, implemented ht cables 
All rubbers are now made by first producing the polymer and then
vulcanizing it with Sulfur (equivalent to natural rubber).

Rewrote WireProcessing to reduce the amount of duplicate code.

Implemented recipes that utilize a combination of a dielectric and a
synthetic rubber to make cables.
This halves total insulation cost for below-EV cables and reduces it to
75% for EV+ cables (conductive polymer not yet implemented).
 2017-06-03 12:59:25 +02:00
Johannes Gäßler
e3873392a8 Added two changes accidentally not added to the previous commit. 2017-06-03 12:47:01 +02:00
Johannes Gäßler
8a19bd9fc9 Increased the input slots of the assembler from 2 to 6. 2017-06-03 12:45:20 +02:00