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

70 commits

Author SHA1 Message Date
SLiMylya
cbefd59741 NEI GUI AssemblyLine 2017-06-24 09:51:59 +03: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
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
Techlone
1b753d3528 Reworking DataOrb and DataStick 2017-06-13 20:52:53 +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
Technus
c9908ffa98 wire/pipe hiding/reduced size 2017-06-04 09:28:43 +02: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
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
Johannes Gäßler
8823dc53f8 Added a GUI for the Large Chemical Reactor 2017-05-15 21:08:27 +02:00
Johannes Gäßler
20142f1b10 Merge branch 'ChemistryUpdate' into LargeChemicalReactor 
Conflicts:
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
 2017-05-12 21:12:01 +02:00
Johannes Gäßler
0c2dee56da Added new textures for the LCM, using them now 2017-05-09 21:51:49 +02:00
Johannes Gäßler
8ac41d3c3c Chem reactors can now output 2 items, implemented recipes for Nitric 
Acid,added utility methods to get Material cells or integrated circuits,
it's now possible to declare a temperature for automatically created
fluids / gases
 2017-04-30 01:36:10 +02:00
Blood-Asp
6f5e16b286 Updated Achievements to fit changed circuits 2017-04-01 01:03:52 +02:00
Dimach
76e82ed355 Implement #292. 2017-03-15 04:51:15 +02:00
Blood-Asp
e81dca3320 More circuit balancing 2017-03-01 12:31:22 +01:00
Blood-Asp
48b2e2b87d Merge pull request #904 from Techlone/unstable 
Add new semiconductors and indium recipe
 2017-02-28 14:18:28 +01:00
Blood-Asp
4e043f617b Circuit changes 2017-02-28 02:04:47 +01:00
Techlone
b2157c6320 Add new semiconductors and indium recipe 2017-02-17 23:45:56 +05:00
Blood-Asp
b6674c9d96 Finish Cleanroom 2017-02-11 01:04:46 +01:00
Blood-Asp
f12ae9a63f Add Naquadah fuel rods and fix some Assemblyline recipes 
Naquadah fuel = Mox with 10x runtime.
 2016-10-22 16:38:18 +02:00
Blood-Asp
b48613dc7d Add EnderIO Rocket Fuel compat 2016-10-19 00:37:48 +02:00
Blood-Asp
7cec5fae5f Add the missing food crops 2016-10-17 17:13:41 +02:00
Blood-Asp
1e7a044fe0 Remove .bats since Curse does not like them. Take from old builds if needed. 2016-09-28 13:23:42 +02:00
Blood-Asp
a35cb1084f Merge pull request #569 from OneEyeMaker/NewFeatures 
New Heating coils.
 2016-07-27 01:52:15 +02:00
Draknyte1
dafe88d8e8 Makes GT Sound volume adjustable via proper sliders. 2016-07-27 07:46:59 +10:00
OneEyeMaker
9946e904b4 Merge branch 'experimental' into NewFeatures 2016-07-26 09:01:16 +03:00
OneEyeMaker
c4bd35d7cd Coils should be deprecated 2016-07-26 07:31:57 +03:00
Muramasa
16cac26b72 Separated multiblock overlay and gui textures 2016-07-26 00:52:30 +01:00
OneEyeMaker
b6e4f869b8 Redesigned achievements. 2016-07-24 15:47:50 +03:00
Muramasa
676e326ec0 Various fixes/cleanup 
Game will no longer crash without UBC loaded
Added missing mallet textures to materialicon Lignite
 2016-07-22 01:41:51 +01:00
OneEyeMaker
47ce855868 Redefined some wires. Added last heating coil block. 2016-07-21 08:48:22 +03:00
OneEyeMaker
f98e51a82f Added new tier of heating coils. 
//TODO: Find material for LuV coils.
 2016-07-20 10:27:47 +03:00
OneEyeMaker
ea5305f7df Restored broken compatibility. 2016-07-18 14:56:21 +03:00
OneEyeMaker
b780ef6c2c Updated tooltips 2016-07-17 16:16:43 +03:00
OneEyeMaker
c9bc17bce5 Added new heating coil blocks. 2016-07-17 15:20:29 +03:00
Muramasa
51e269e3f5 Initial 
This is more of a test and resource for when I eventually rewrite the
GT5U ore texture/metadata system.
 2016-07-16 23:48:25 +01:00
Blood-Asp
c2be6ff64c Small fixes and rebalances 2016-07-01 21:44:44 +02:00
Blood-Asp
bcbeebf3b8 First Assemblyline recipes 2016-07-01 02:06:51 +02:00
Blood-Asp
b465f8f25c Adding LuV, ZPM and UV components 2016-07-01 01:41:28 +02:00
Blood-Asp
72ff25f9b7 Add new Fuel, Fix emitter and field gen recipes, add charcoal/lignite block fuel values 2016-06-23 23:43:22 +02:00
Blood-Asp
11721a7765 Changed Field Generator recipes 2016-06-23 01:02:58 +02:00
Muramasa
7e52fb2805 Bug fixes for my commits 
Removed commented out old turbine texture code
Fixed Diesel Engine "Fuel Value" unit to EU/L
Fixed mistake with Diesel Engine tooltip. Now asks for Gear boxes.
Forgot to add recipe for Engine Intake.
Redone the Gas/HPSteam turbine recipes.
Fixed Oxygen/Lube being consumed if there is diesel in the hatch, but
not enough for the engine to run
Updated Engine GUI
 2016-06-21 00:17:21 +01:00
Muramasa
8e25705a3d Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into DieselGenerator 2016-06-19 23:46:40 +01:00
Muramasa
240d346883 Fixes #367 by adding missing buttons to guis 2016-05-24 21:59:42 +01:00
Muramasa
8880eb8d6d Basically a rewrite 2016-05-20 05:36:32 +01:00
Muramasa
4a59d0efbd Implemented Output Calculation 2016-04-29 07:31:58 +01:00
Muramasa
76902f45f7 More Cleanup and finalizing 2016-04-28 01:52:46 +01:00
Muramasa
12a1d1c46e Main Commit 2016-04-19 23:17:31 +01:00
Muramasa
79444adc76 Revert "Turbine Rebalance" 
This reverts commit ddc0c4299e.
 2016-04-17 07:41:35 +01:00