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

320 commits

This branch
This branch
All branches
Author SHA1 Message Date
Techlone
ef23dc90b2 Fix #469 #508 2016-06-19 18:03:01 +05:00
Techlone
eb0e2e4a01 Merge branch 'experimental' of https://github.com/Blood-Asp/GT5-Unofficial into experimental 2016-06-17 22:06:53 +05: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
Muramasa
ab6c431b88 Rearranged two achievements. Fixes #478 2016-05-25 22:25:24 +01:00
Muramasa
bbcc38e930 More fixes for #507 2016-05-25 19:16:41 +01:00
Muramasa
2cad97e975 Fixes #507 2016-05-24 22:02:46 +01:00
Muramasa
240d346883 Fixes #367 by adding missing buttons to guis 2016-05-24 21:59:42 +01:00
Muramasa
0fadfa2543 Fixes #501 2016-05-24 21:37:46 +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
OneEyeMaker
5169c509d6 Added configuration file to enabling processing of ores 2016-05-18 07:41:36 +03:00
MauveCloud
b2e564412f Added missing assembler recipes for casings 
Added missing assembler recipes for casings: Basic Machine Casing, UV
Machine Casing, Heat Proof Machine Casing, Cupronickel Coil Block,
Kanthal Coil Block, Nichrome Coil Block, Superconducting Coil Block,
Solid Steel Machine Casing, Frost Proof Machine Casing, Robust
Tungstensteel Casing, Clean Stainless Steel Casing, Stable Titanium
Casing, Fusion Casing, Turbine Casing, Stainless Steel Turbine Casing,
Titanium Turbine Casing, Tungstensteel Turbine Casing
 2016-05-12 14:24:04 -07:00
Techlone
34c5fd807d Merge branch 'experimental' of https://github.com/Blood-Asp/GT5-Unofficial into experimental 2016-05-02 15:14:10 +05:00
Blood-Asp
3f46725bbc Fix Butput Bus :P 2016-04-29 20:54:09 +02:00
Blood-Asp
27eb1c67e4 Merge pull request #499 from MauveCloud/experimental 
Improved output bus handling
 2016-04-29 20:42:55 +02:00
MauveCloud
b69385d29b Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into experimental 2016-04-28 11:30:29 -07:00
MauveCloud
a88988770b Improved brittle charcoal handling. 2016-04-28 11:30:00 -07:00
MauveCloud
9036858017 Improved output bus handling 2016-04-27 17:31:20 -07:00
Blood-Asp
5c8eec846d Merge pull request #493 from Muramasa-/TurbineCasingRebalance 
Turbine casing rebalance
 2016-04-27 21:18:29 +02:00
Blood-Asp
fd99216b35 Merge pull request #497 from MauveCloud/experimental 
Added Crop Calculator support.
 2016-04-27 21:18:05 +02:00
MauveCloud
784c65a884 Added Crop Calculator support. 2016-04-26 13:30:26 -07:00
Muramasa
cb962573e2 Missed a file 2016-04-19 23:31:41 +01:00
Muramasa
d713c5ddec Remove Diesel Turbine 2016-04-19 23:19:59 +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
Muramasa
ddc0c4299e Turbine Rebalance 
Added 3 new turbine casings to rebalance the turbines. Also changed
turbine controller recipes to fit the rebalance.

Large Steam: Steel Turbine Casing
Large HP Steam Turbine: Stainless Steel Turbine Casing
Large Gas Turbine: Steel Turbine Casing
Large Diesel Turbine: Titanium Turbine Casing
Large Plasma Turbine: Tungstensteel Turbine Casing
 2016-04-17 07:40:10 +01:00
Muramasa
063b62b4ca Fixed newMetaEntity using Plasma Generator 2016-04-17 03:05:58 +01:00
Muramasa
31e4330b69 Large Diesel Generator 
Added large diesel generator to the game. It replicates the Large Plasma
Generator but it's nominal output is 1/8 that plasmas is.

Plasma Nominal: Optimal Steam Flow * 40
Diesel Nominal: Optimal Steam Flow * 5
 2016-04-17 01:41:06 +01:00
Blood-Asp
c98736b7b3 Adding assembly line recipe check 2016-04-11 23:14:57 +02:00
Blood-Asp
22dd09be01 Adding assembly line recipes 2016-04-11 22:30:53 +02:00
Blood-Asp
83344732eb Cleanup 2016-04-11 21:50:01 +02:00
Blood-Asp
3aae928510 Added Assembly Line Multiblock 2016-04-11 21:47:53 +02:00
Blood-Asp
150aed2f84 Merge pull request #482 from draknyte1/UpToDateGTPRBranch 
Changes Soft Hammer -> Soft Mallet & Flips Icon. Makes them easier to differ now.
 2016-04-11 13:41:51 +02:00
Alkalus
e634563157 Update ProcessingPipeMedium.java 
Apparently it has a newline at the end.
 2016-04-11 20:54:52 +10:00
Alkalus
f1af2039bb Update ProcessingPipeSmall.java 
Apparently it has a newline at the end.
 2016-04-11 20:54:45 +10:00
Alkalus
63d70c3ff0 Update ProcessingPipeLarge.java 
Apparently it has a newline at the end.
 2016-04-11 20:54:27 +10:00
Draknyte1
36a97e706b Submitting PR's is a pain. 
Always use most up to date files for the repo you're contributing to. #NotGT5.8Files
 2016-04-11 20:47:30 +10:00
Draknyte1
0f8d8b95d1 Merge branch 'UpToDateGTPRBranch' of https://github.com/draknyte1/GT5-Unofficial into UpToDateGTPRBranch 2016-04-11 20:36:08 +10:00
Draknyte1
523d2c449e Should fix any issues. 2016-04-11 20:34:56 +10:00
Alkalus
ba1f0f99ab Update GT_MetaGenerated_Tool_01.java 
left a : not a ;
 2016-04-10 19:29:56 +10:00
Draknyte1
1d279c741f Made these up to date with latest experimental commit, as mine were slightly out of date. :) 2016-04-10 19:15:41 +10:00
Draknyte1
26e60b7020 Changed a few things to make the Soft Hammer more noticeable from the Hard Hammer. 
Now it's a soft Mallet with an inverted icon, as requested by @DarknessShadow - https://github.com/Blood-Asp/GT5-Unofficial/issues/407

# Conflicts:
#	src/main/java/gregtech/api/enums/OrePrefixes.java
#	src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java
#	src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeLarge.java
#	src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeMedium.java
#	src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeSmall.java
 2016-04-10 18:36:52 +10:00
Blood-Asp
a04b7f5159 Merge pull request #473 from leagris/experimental 
Fix #472 #219
 2016-04-04 21:53:58 +02:00
Léa Gris
aa922c5470 Re Fix #472 #219 2016-04-04 18:43:35 +02:00