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

413 commits

Author SHA1 Message Date
Muramasa
5fe4798e6b Fix harvest level 2016-07-22 02:58:39 +01: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
Muramasa
248ce596a5 Ore System Rewrite part 2 
Lots of ore system changes
Added Marble/Basalt gen
Ore Mixes can now have a specified biome name that they can only spawn
in
 2016-07-21 07:24:42 +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
Dream-Master
eeab702de4 Fix Multismelter 
Change Wire recipe and Fix 643
 2016-07-18 22:32:39 +02:00
Muramasa
de6e90a000 Ore system rewrite 2016-07-18 19:00:53 +01:00
OneEyeMaker
ea5305f7df Restored broken compatibility. 2016-07-18 14:56:21 +03:00
OneEyeMaker
8bf5b61dea Moved all coils to another block. 2016-07-18 10:05:44 +03:00
OneEyeMaker
ce1e6917e0 Preparations for moving all heating coils to another block. 2016-07-18 09:06:26 +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
DEMOOH
8419ddaefc Update GT_Cover_Fluidfilter.java 2016-07-17 00:07:10 +03:00
Martin
2a4e2aa133 Remove ghost items from Assembly Line input slots (Blood Asp) 2016-07-13 16:25:28 +02:00
Blood-Asp
be3a6292bb Remove ghost items from Assembly Line input slots 2016-07-12 22:04:36 +02:00
Blood-Asp
435c3cd526 Update GT Capelist URL 2016-07-10 20:28:35 +02:00
Dream-Master
98ec8a6bdd Fix id 2016-07-05 19:43:45 +02:00
Dream-Master
f1f3c8673b Fixing Ids. 2016-07-05 19:25:36 +02:00
Dream-Master
32a4f8be83 Added LuV, ZPM and UV Mob Rep 
Changed ids from Fluid regulators because overlays ids.
 2016-07-05 19:20:20 +02:00
Dream-Master
3ce817dddb More Pollution work 2016-07-04 18:41:53 +02:00
Dream-Master
a22dc1f3e4 Pollution base work (Blood Asp) 2016-07-04 18:37:34 +02:00
Dream-Master
51f2d56284 Name fixes Assembly Line (Blood Asp) 2016-07-04 17:53:32 +02:00
Dream-Master
b99feff3d8 make GT trigger ic2 achievements (Blood Asp) 2016-07-04 17:46:17 +02:00
Blood-Asp
704d534b43 More Pollution work 2016-07-03 18:35:51 +02:00
Blood-Asp
57deb3b3e1 Pollution basework 2016-07-03 18:31:06 +02:00
Blood-Asp
d21357bd84 Name fixes 2016-07-03 12:37:21 +02:00
Blood-Asp
ca0b8f396e make GT trigger ic2 achievements 2016-07-02 22:35:29 +02:00
Dream-Master
6cff64480a Adding new Tooltip to Assembly Line 
Adding Iridium and Naquada ingots in EBF
Fix zpm Motor (Blood Asp)
 2016-07-02 11:49:10 +02:00
Blood-Asp
c320af9f3e Even more changes 2016-07-01 22:23:04 +02:00
Blood-Asp
c2be6ff64c Small fixes and rebalances 2016-07-01 21:44:44 +02:00
Dream-Master
a560557fdf fix Stuff 2016-07-01 18:54:08 +02:00
Blood-Asp
20de7ff06f PR fixes: Turbine casings readded, Dieselgen readded, balancing changes 
Also deactivated higher tier pumps, these cover so huge areas, that
servers lag extremely.
Nerfed new cables a bit.
 2016-07-01 18:08:01 +02:00
Dream-Master
aa35ec7ccd Turbine tooltip fixes(Muramasa) 2016-07-01 09:05:24 +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
1497dc47e5 Merge pull request #550 from Muramasa-/Default 
Turbine tooltip fixes
 2016-07-01 01:16:10 +02:00
Blood-Asp
f496def067 Fixed Pyrooven overclocking 2016-07-01 01:14:35 +02:00
Blood-Asp
73749472d2 Finish Assemblyline recipe printing 2016-07-01 01:13:09 +02:00
Dream-Master
c3fcd31146 Finish Assemblyline recipe check (Blood Asp) 2016-06-30 22:28:48 +02:00
Blood-Asp
7ee09889d9 Finish Assemblyline recipe check 2016-06-30 22:17:18 +02:00
Dream-Master
857fb7ec02 Assembly Line recipe work (Blood Asp) 2016-06-30 21:24:13 +02:00
Dream-Master
7c6c34ed0f Make plasma turbine output cooled versions of plasma (Blood Asp) 2016-06-30 20:18:58 +02:00
Muramasa
d8df9e1565 Turbine tooltip fixes 2016-06-30 18:14:34 +01:00
Blood-Asp
173e5a11d7 Merge pull request #547 from perkinslr/experimental 
Make plasma turbine output cooled versions of plasma
 2016-06-30 14:49:25 +02:00
Logan Perkins
ad8ad42542 Update GT_MetaTileEntity_LargeTurbine_Plasma.java 2016-06-29 22:37:41 -07:00
Blood-Asp
90d776893e More Assembly Line recipe work 2016-06-30 00:12:00 +02:00
Dream-Master
02c801afac fix 2016-06-29 08:48:37 +02:00
Blood-Asp
22525fd6e8 Merge pull request #546 from perkinslr/experimental 
Fix 'cannot find symbol' error in AdvMiner2
 2016-06-29 00:23:44 +02:00
Dream-Master
db3b2e1a4a fix adv miner 
comit form  perkinslr
 2016-06-28 08:49:31 +02:00
Logan Perkins
fcb685693e Update GT_MetaTileEntity_AdvMiner2.java 2016-06-27 17:28:18 -07:00
Logan Perkins
9be4d8c270 Update GT_MetaTileEntity_AdvMiner2.java 2016-06-27 17:20:47 -07:00
Logan Perkins
4adb6554c2 Update GT_MetaTileEntity_AdvMiner2.java 2016-06-27 17:12:02 -07:00
Blood-Asp
b9ee95c797 AL Recipe work 2016-06-27 23:49:18 +02:00
Dream-Master
3d9a779242 fix thanks @Muramasa 2016-06-27 16:56:24 +02:00
Dream-Master
5de110ad42 This works 
HeeEndium
 2016-06-26 23:43:15 +02:00
Dream-Master
33722641e6 change back name 2016-06-26 11:12:19 +02:00
Logan Perkins
dfb263e7dd Update GT_MetaTileEntity_AdvMiner2.java 2016-06-25 15:43:13 -07:00
Dream-Master
a73309a5e5 revert delete bees 2016-06-25 15:24:45 +02:00
Dream-Master
05125232c6 reverse commit 2016-06-25 15:15:16 +02:00
Dream-Master
fc4e0c75b3 remove Bees module 2016-06-25 14:44:34 +02:00
Dream-Master
e59aa14e5e fix 2016-06-25 11:26:55 +02:00
Dream-Master
a99ba0e265 Silk-touch then pulverize ores in advanced miner II 2016-06-25 11:25:23 +02:00
Logan Perkins
1fe2787532 Update GT_MetaTileEntity_AdvMiner2.java 2016-06-24 20:50:10 -07:00
Logan Perkins
577ea17e65 Update GT_MetaTileEntity_AdvMiner2.java 2016-06-24 20:45:04 -07:00
Logan Perkins
9ed45df5b7 Update GT_MetaTileEntity_AdvMiner2.java 2016-06-24 16:18:03 -07:00
Dream-Master
5e1720e282 Revert "make steam boilers not automatable" 2016-06-24 20:44:28 +02:00
Dream-Master
8a3ed09c46 Blood Asp changes 2016-06-24 01:32:57 +02:00
Blood-Asp
cea067c613 More superfuel fixes 2016-06-24 01:08:26 +02:00
Blood-Asp
df6e07b5cd Merge pull request #537 from Muramasa-/DieselGenerator 
Fuel efficiency changes for Large Diesel Engine
 2016-06-24 00:41:46 +02:00
Blood-Asp
104715c86c missed a bit 2016-06-23 23:44:07 +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
Muramasa
5263c85dc5 Fuel efficiency changes for Large Diesel Engine 2016-06-23 20:02:43 +01:00
Blood-Asp
11721a7765 Changed Field Generator recipes 2016-06-23 01:02:58 +02:00
Dream-Master
5ba763562b no no no 2016-06-22 23:12:57 +02:00
Dream-Master
e1ebdd82f8 e8936bf8d9 
AdvMinerII: check that ore block still exists; consider chance output
 2016-06-22 23:11:45 +02:00
Dream-Master
759ff09662 9ea49989b6 [9ea4998] 2016-06-22 22:42:28 +02:00
Dream-Master
65300896c0 754300d8fd [754300d] 2016-06-22 21:50:07 +02:00
Dream-Master
6f4c04fcac 099fa5d112 [099fa5d] 2016-06-22 21:39:29 +02:00
Dream-Master
fb48f27edb 0a5ea5afae [0a5ea5a] 2016-06-22 21:26:30 +02:00
Dream-Master
64c0c1ca9d c68814f780 [c68814f] 2016-06-22 21:24:15 +02:00
Dream-Master
d52d256f57 1412d578cb [1412d57] 2016-06-22 21:16:01 +02:00
Dream-Master
7cf4b14004 3af174488a [3af1744] 2016-06-22 21:12:55 +02:00
Dream-Master
fc8ed2e622 9b6927e8e3 [9b6927e] 2016-06-22 20:46:10 +02:00
Dream-Master
35f51d2f3c e85a2d3e8a [e85a2d3] 2016-06-22 20:37:47 +02:00
Dream-Master
10a1a2ee47 Adv Mine 2 Texture 2016-06-22 20:30:31 +02:00
Dream-Master
7f0ce6117c New Large Fluid Cells 2016-06-22 19:54:59 +02:00
Dream-Master
ebb6aea12d 952c9d72b0 [952c9d7] 2016-06-22 19:48:44 +02:00
Dream-Master
b1d93e3853 b563a16e71 [b563a16] 2016-06-22 19:47:36 +02:00
Dream-Master
e0fe711de5 b4bfeb21f8 [b4bfeb2] 2016-06-22 19:35:03 +02:00
Dream-Master
ada744c29a d718cac331 [d718cac] 2016-06-22 18:52:27 +02:00
Dream-Master
55c49f3021 remove Nugget to Ingot recipe. 
If i know this before i never wrote hundreds of MT Lines
 2016-06-22 17:40:58 +02:00
Dream-Master
aa14481d3b abc6cfc291 [abc6cfc] 2016-06-22 17:22:43 +02:00
Dream-Master
f658c3b362 Error fixes 2016-06-22 01:33:23 +02:00
Dream-Master
57fa6a070d 2cab6b8166 [2cab6b8] 2016-06-22 00:45:32 +02:00
Dream-Master
cd29cf4da5 4521769f7b [4521769] 2016-06-22 00:39:40 +02:00
Dream-Master
f186d60ca4 543f71cc97 [543f71c] 2016-06-22 00:37:12 +02:00
Dream-Master
52128fdb46 b0e7ffa8e5 [b0e7ffa] 2016-06-22 00:36:10 +02:00
Dream-Master
cd98901ecf 898a045a97 [898a045] 2016-06-22 00:30:46 +02:00
Dream-Master
5af854d762 87c81f8d85 [87c81f8] 2016-06-22 00:25:57 +02:00
Dream-Master
3917d26760 91d34c2c68 [91d34c2] 2016-06-22 00:05:04 +02:00
Techlone
ee2abbd3f2 AdvMinerII: check that ore block still exists; consider chance output 2016-06-22 01:30:27 +05:00
Dream-Master
e29201f753 new files from gt pull requests 2016-06-21 21:36:03 +02:00
Dream-Master
a88d9c4e72 experimental branch 2016-06-21 21:07:14 +02:00
Blood-Asp
7a9c3857e2 Merge pull request #526 from perkinslr/experimental 
Make processing array handle multiple input stacks at a time
 2016-06-21 19:56:34 +02:00
Blood-Asp
5728c8d93f Merge pull request #534 from Muramasa-/DieselGenerator 
Bug Fixes
 2016-06-21 19:56:20 +02:00
Blood-Asp
75d71e546b Fix fced86e11a hiding almost all metaitems 2016-06-21 19:51:54 +02:00
Dream-Master
fafe1bcc88 reverse commit 2016-06-21 19:32:31 +02:00
Dream-Master
09add3e8ac even with Blood asp experimental branch 2016-06-21 18:50:29 +02:00
Dream-Master
b09b54435f remove all 2016-06-21 18:42:02 +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
Logan Perkins
f16aeb2d1f Update GT_MetaTileEntity_ProcessingArray.java 2016-06-19 15:58:04 -07:00
Blood-Asp
f708fc5ff8 Corrected Wood Plates burn value 2016-06-20 00:40:00 +02:00
Blood-Asp
77a163e0e4 Fix infinite miningpipes exploit from advanced miner 2 2016-06-20 00:21:41 +02:00
Blood-Asp
8269cd58e6 Fix wrong energy values for comp and crop processing 2016-06-20 00:07:55 +02:00
Blood-Asp
491a6d6c4b Plunger also emptys input tank after output tank is empty 2016-06-19 22:44:28 +02:00
Blood-Asp
2427bc1521 Make distillation tower work with different fluids in input hatches 2016-06-19 22:02:19 +02:00
Blood-Asp
6b556371aa Fixed Entchanted Books in magic absorber 2016-06-19 20:36:49 +02:00
Blood-Asp
20201d069a Fixed Magic Energy Absorber efficiency calculation 2016-06-19 20:23:49 +02:00
Blood-Asp
7424f75315 Added missing machines to processing array 2016-06-19 19:15:07 +02:00
Blood-Asp
ffd9964cd3 Changed Bittle charcoal tool back to axe 2016-06-19 19:02:48 +02:00
Blood-Asp
96607760e1 EnderIO Wrench Support 2016-06-19 18:23:28 +02:00
Blood-Asp
1ace2c4e35 Blacklist Unstable Ingots from unification 2016-06-19 17:42:43 +02:00
Blood-Asp
3a249d8075 Merge pull request #500 from Muramasa-/DieselGenerator 
Large Diesel Generator
 2016-06-19 17:12:23 +02:00
Techlone
ef23dc90b2 Fix #469 #508 2016-06-19 18:03:01 +05:00
Muramasa
58ed5088e1 Final commit 2016-06-12 19:32:29 +01:00
Logan Perkins
c596231af4 Make processing array use all input stacks 2016-06-12 10:39:33 -07:00
Muramasa
237e5e682d Possibly final commit 2016-06-01 06:34:33 +01:00
Technus
9ea49989b6 Minor Fix 
Actually makes the smelt at once cap bigger.
 2016-05-30 21:12:25 +02:00
Blood-Asp
dc2a48259a Merge pull request #518 from Muramasa-/TweaksAndFixes 
Crash  Fix / Various Tweaks
 2016-05-27 20:11:07 +02:00
Blood-Asp
35a7a99808 Merge pull request #515 from OneEyeMaker/OreProcessing 
Added configuration file, that enables processing of ores
 2016-05-27 20:07:37 +02:00
Blood-Asp
d4f00173e5 Merge pull request #511 from MauveCloud/experimental 
Added missing assembler recipes for casings
 2016-05-27 20:04:40 +02:00
MauveCloud
d1b737c6cc Fixed incomplete redo of brittle charcoal adventure fix 
(had reverted after improper testing with axe instead of shovel, then
neglected to check rebuilding with gradle after re-implementing fix in
source)
 2016-05-26 09:57:39 -07:00
MauveCloud
f5bb397009 Reinforced Block and Brittle Charcoal fixes 
Added fixes for #503 and #436
 2016-05-26 07:43:02 -07:00
Muramasa
79fc84d5d2 isPlasmaCellUsed additional null check 2016-05-26 00:55:34 +01:00
Muramasa
fced86e11a Fixes #268. Shows plasma cells that have a fusion recipe 2016-05-26 00:52:09 +01:00
Dream-Master
5c46e9fb88 wrongly remove Code 2016-05-26 00:10:56 +02:00
Dream-Master
ef617a041e fix 2016-05-25 23:40:43 +02:00
Dream-Master
9af2049318 Adding Assembly Line (no Assembler Casing recipe yet) 2016-05-25 23:34:55 +02:00
Dream-Master
78c691d754 Adding the New Turbines from Gt 5.09 and some Assembler recipe 2016-05-25 21:43:52 +02:00
Muramasa
bbcc38e930 More fixes for #507 2016-05-25 19:16:41 +01:00
Muramasa
3c32671623 Crash Fix 2016-05-24 00:05:20 +01:00
Muramasa
680676e411 Redone Tooltips and some scanner info 2016-05-24 00:04:36 +01:00
Muramasa
cddca6e2be Derp 2016-05-23 18:40:01 +01:00
Muramasa
960087a0a8 Cleanup + Improvement 2016-05-23 18:15:21 +01:00
Dream-Master
9f8de14a9f Change Fuel and Nitro diesel values 
change Burn value of Lignite coal 4x
Change Gui Pic from Distillation Tower and Large Heat Exchanger (thanks to Draknyte1)
 2016-05-22 02:15:51 +02:00
Dream-Master
48dac29710 Thaumcraft Aspect fix 2016-05-22 01:47:08 +02:00
Dream-Master
71790e5214 fix 2016-05-22 01:28:37 +02:00
Dream-Master
cbd6ba6651 Merge branch 'Scan-termals-of-EBF' 
Conflicts:
	build.properties
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
 2016-05-22 01:26:18 +02:00
Dream-Master
2d582f300e Fix #591 
Added EBf recipes for Ender io Materials with oxy and without
 2016-05-22 01:24:02 +02:00