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

135 commits

Author SHA1 Message Date
Blood-Asp
6df7f36bd9 Merge branch 'unstable' into CircuitChemistryUpdateFollowup 2017-09-03 17:57:34 +02:00
Blood-Asp
edba8167b6 Merge branch 'unstable' into patch-5 2017-09-03 14:55:30 +02:00
Blood-Asp
471ed5c9ea Merge pull request #1193 from Antifluxfield/patch-4 
Improve fluid regulator
 2017-09-03 14:45:38 +02:00
Antifluxfield
eb749f64ca Use "/n " as seperator 2017-08-21 21:38:39 +08:00
Johannes Gäßler
c2e4ebea6e Fixed EV Pumps using the wrong Rubber 2017-08-21 09:05:08 +02:00
Antifluxfield
d5b0dcfa50 Multi-line tooltip of #1193 2017-08-21 09:59:47 +08:00
Antifluxfield
4724bbe403 Adding tooltip 2017-08-19 12:08:34 +08:00
Johannes Gäßler
ee7f576abf Reenabled regular Rubber for the EV Conveyor Belt 2017-08-02 22:15:30 +02:00
Johannes Gäßler
d1a106aa81 Added a line to the NEI handler that hints at leaving IntCirc(0) empty 2017-08-01 13:56:29 +02:00
Johannes Gäßler
3ddd4158ab Changed Vacuum Freezer Circuits: Elite -> Data/Extreme 2017-07-31 10:15:32 +02:00
Johannes Gäßler
83d64e5d52 Added a new Basic Circuit: Microprocessor 
Produced similarly to the Integrated Processor, but yields 2 Basic
Circuits instead of 1 Good Circuit.
 2017-07-31 10:10:36 +02:00
Johannes Gäßler
6a1d32e4a3 Overhauled the Wetware Circuit recipes 
They no longer need beer.
Also the basic Wetware Processor only needs 1 Wetware Circuit Board.
 2017-07-31 09:46:57 +02:00
Johannes Gäßler
54fc4e222a Overhauled Fiberglass Circuit Board 
Renamed: Fiberglass Circuit Board -> Fiber-Reinforced Circuit Board
Fiber-Reinforced Boards are now made by combining Epoxy Resin with
either Glass Fiber or Carbon Fiber.

Glass Fiber is produced from Borosilicate Glass, which is in turn
produced from Glass and Boron.
To make this feasible Salt and Rock Salt now yield Borax as a byproduct.
 2017-07-26 21:50:09 +02:00
Johannes Gäßler
4cda183354 Added a new Circuit board tier: Plastic Circuit Board 2017-07-25 17:42:52 +02:00
SLiMylya
820b335d83 add config EnableZPMandUVBatteries default false 2017-07-17 12:56:37 +03:00
SLiMylya
612cece629 update change 2017-07-09 19:36:23 +03:00
SLiMylya
c607243491 add battery 2017-07-08 14:04:12 +03:00
Blood-Asp
2385f04b41 Fix cover and mode spelling 2017-07-01 18:14:05 +02:00
Johannes Gäßler
ddf58e6ef4 Merge branch 'unstable_blood' into unstable 
Conflicts:
	src/main/java/gregtech/api/enums/MaterialBuilder.java
	src/main/java/gregtech/common/GT_RecipeAdder.java
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
 2017-06-26 20:25:32 +02:00
Johannes Gäßler
f698d3f8e0 Merge branch 'BrickedBlastFurnace' into unstable 
Conflicts:
	src/main/java/gregtech/GT_Mod.java
	src/main/java/gregtech/api/enums/Materials.java
	src/main/java/gregtech/common/GT_Proxy.java
	src/main/java/gregtech/common/blocks/GT_Block_Casings4.java
	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
 2017-06-25 23:45:45 +02:00
Technus
6abdc95c0c Optimize imports - intelliJ one button action 2017-06-25 12:09:46 +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
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
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
e30a5694ff wood plank compressor recipe #1013 2017-06-13 23:10:49 +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
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
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
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
30de32fb07 Monocrystalline Silicon Boule 2017-06-04 00:28:53 +02:00
JohannesGaessler
7eb176f3a2 Merge branch 'unstable' into ChemistryUpdate 2017-06-01 10:22:10 +02:00
Blood-Asp
9a69e1978d Fix comb processing recipes #1052 2017-05-31 22:57:21 +02:00
Blood-Asp
1af33411d2 Disable switching armor gui because of broken sync 2017-05-31 18:53:56 +02:00
Blood-Asp
40304ed2f5 Catch login armor crash 2017-05-31 18:09:30 +02:00
Johannes Gäßler
869cad0bba Added a lot of (petro)chemistry stuff, expanded the API 
Created an adapter class for creating materials.
Materials now have bit flags for automatic gas/fluid creation.
Added a new convenience method for adding distillery recipes.
Recipes now show the exact recipe duration instead of the duration
rounded down to the nearest int.

Added new Materials with relevant recipes:
Acetic Acid, Acetone, Calcium Acetate, Charcoal Byproducts, Carbon
Monoxide, Ethanol, Ethylene, Methanol, Methyl Acetate, Polyvinyl
Acetate, Propene, Sulfuric Ethylene, Vinyl Acetate

Made vinegar visible.
 2017-04-19 23:36:50 +02:00
Blood-Asp
7beabd163a catch most modular armor crashes 2017-03-31 22:24:36 +02:00
Blood-Asp
d41d3cd2b3 Add assemblyrecipes for all circuits per oredict 2017-03-31 22:24:15 +02:00
Blood-Asp
6582650cf4 Fix spelling of wafers 2017-03-22 19:09:25 +01:00
MauveCloud
b9d4d15a0c Fix for negative-coordinate vein generation, adjustments to recipes for stone dust, sand, and flint 2017-03-16 16:24:39 +02:00
Dimach
e6f6150781 Cleanup code and fix incorrect merge. 2017-03-16 16:24:39 +02:00
Blood-Asp
48d7a1ee5d Fix rubber plates in modular armor boots 2017-03-08 17:52:28 +01:00
Blood-Asp
af43ebade1 Better circuit tooltips 2017-03-08 16:57:16 +01:00
Blood-Asp
7cb02737de Moar circuit balance 2017-03-05 00:22:54 +01:00
Blood-Asp
cd6571ade8 Some recipe fixes. 2017-03-01 23:32:02 +01:00
Blood-Asp
f12964c716 Remove rubber from steamage 2017-03-01 13:36:27 +01:00
Blood-Asp
e81dca3320 More circuit balancing 2017-03-01 12:31:22 +01:00
Blood-Asp
4e043f617b Circuit changes 2017-02-28 02:04:47 +01:00
vlad20012
095275bb36 Fix #851 2017-01-10 11:20:35 +03:00