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

1237 commits

This branch
This branch
All branches
Author SHA1 Message Date
Technus
3a83a35433 Visualy paintable un-insulated wires 2016-04-16 16:25:45 +02:00
Martin
efa4392b33 Merge pull request #3 from UltraPeeks/patch-1 
Fix custom ore mixes more common than intended
 2016-04-14 19:24:50 +02:00
UltraPeeks
79edded171 Fix custom ore mixes more common than intended 
The for loop above already registers all custom ore mixes. The first 16 custom mixes were registered a second time and were double as likely as intended to spawn. For example copper was much more difficult to find that way.
 2016-04-14 19:04:17 +02: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
Martin
851995fb6e Merge pull request #2 from GTNewHorizons/Unable-to-test-block-fix 
Possible fix for map crashings.
 2016-04-10 12:14:13 +02:00
Technus
7a047d977a Update GT_Utility.java 2016-04-10 12:09:28 +02: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
Dream-Master
3cf92b0a59 Add Draconium to tag metal 2016-04-09 17:57:17 +02:00
Dream-Master
9b6927e8e3 Fixed Cells recycling 
Bump Version
 2016-04-09 14:14:32 +02:00
Dream-Master
35b5bb31f9 Revert "adding Adv Miner to us Version" 
This reverts commit 6427be7b6d.
 2016-04-09 14:02:34 +02:00
Dream-Master
df61939d03 Revert "Try to add Oil Drill. Works but not pumping oil" 
This reverts commit 26f65443ff.
 2016-04-09 14:02:18 +02:00
Dream-Master
7b0cfabbac fix 2016-04-09 14:00:29 +02:00
Dream-Master
3e6448ff2d Revert "fix the cells recycling recipes" 
This reverts commit 55a35613f7.
 2016-04-09 13:40:39 +02:00
Dream-Master
cf6f93a5c1 Revert "next try not working yet" 
This reverts commit b71a7d48fe.
 2016-04-09 13:26:24 +02:00
Dream-Master
b71a7d48fe next try not working yet 2016-04-09 12:23:59 +02:00
Dream-Master
55a35613f7 fix the cells recycling recipes 2016-04-09 11:40:37 +02:00
Dream-Master
e85a2d3e8a change the item filter recipe using 30 instead of 32 eu. 2016-04-09 01:22:43 +02:00
Dream-Master
2d54d34aef change malachite to Level one because of the Quests 2016-04-08 17:46:52 +02:00
Dream-Master
26f65443ff Try to add Oil Drill. Works but not pumping oil 2016-04-04 22:33:30 +02:00
Blood-Asp
a04b7f5159 Merge pull request #473 from leagris/experimental 
Fix #472 #219
 2016-04-04 21:53:58 +02:00
Dream-Master
6427be7b6d adding Adv Miner to us Version 
adding Drilling Fluid
added a few Textures from Gt 5.09
 2016-04-04 20:04:53 +02:00
Léa Gris
aa922c5470 Re Fix #472 #219 2016-04-04 18:43:35 +02:00
Léa Gris
8a2406de8a Fix #472 #219 2016-04-04 18:20:54 +02:00
Dream-Master
54bdb20c50 Change two textures for the New Cans 2016-04-03 13:50:42 +02:00
Dream-Master
000ae185ec eu fix 2016-04-02 22:41:11 +02:00
Dream-Master
33754091c3 change Cell Fluid amount and materials 2016-04-02 21:50:25 +02:00
Blood-Asp
9e5819e931 made EV charger recipe oredict 2016-04-02 16:18:08 +02:00
Dream-Master
975f9c718f Add more Large Fluid Cells 2016-04-02 14:19:59 +02:00
John
0aad2f7689 Merge pull request #1 from Blood-Asp/experimental 
Update from orig
 2016-04-02 16:07:59 +05:00
Dream-Master
f2876a31a3 Try to add a new Fluid Cell to GT 2016-04-02 13:06:18 +02:00
Dream-Master
952c9d72b0 change Objects 2016-04-02 12:48:16 +02:00
Dream-Master
b563a16e71 Fix Rotor recipes and change Thermos Can and large Fluid Cans recipes. 2016-04-02 12:44:38 +02:00
Dream-Master
dc6314f396 Adding Draconic Ores and Draconic Awakened Ores to GT code. 2016-04-02 11:53:15 +02:00
Dream-Master
b61c25be00 Add Draconium and Draconic Awakened 2016-04-01 22:32:20 +02:00
Dream-Master
46320af060 Tool Tips 
Adding Draconium to GT
 2016-04-01 20:52:48 +02:00
Dream-Master
c1a96e3356 Tool tip 2016-04-01 20:02:42 +02:00
Dream-Master
aeb50268c7 Revert "Cobalt need EBF" 
This reverts commit c1f51414c5.
 2016-04-01 19:58:45 +02:00
Dream-Master
c1f51414c5 Cobalt need EBF 
Change to lv 5
 2016-04-01 19:58:07 +02:00