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

469 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Johannes Gäßler
7f408ff581 Returned BioFuel to its previous state, added BioDiesel instead. 
There are artifacts for fluids called BioFuel, therefore the change.
 2017-06-14 23:15:31 +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
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
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
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
Johannes Gäßler
c7704610c5 Added Rape Crop as a new source of Seed Oil 2017-06-05 16:50:02 +02:00
Technus
71aeac25b9 Missing in item pipe 2017-06-05 15:03:34 +02: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
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
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