Dream-Master
10e42abcc0
438d5f39d3 [ 438d5f3]
2016-06-21 23:17:11 +02:00
Dream-Master
55e302f58d
694a087c75 [ 694a087]
2016-06-21 23:02:05 +02:00
Dream-Master
bbfad579ae
732172cce8 [ 732172c]
2016-06-21 22:42:08 +02:00
Dream-Master
5579f21eb3
e4859f2a1f [ e4859f2]
2016-06-21 22:36:40 +02:00
Dream-Master
4b3913b175
979a6fb543 [ 979a6fb]
2016-06-21 22:30:36 +02: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
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
Blood-Asp
d61667d436
Improved Ultimet stats
2016-06-20 00:39:42 +02:00
Blood-Asp
91fc3a20cd
Implement IBoxable for radioactive componentes
2016-06-19 20:49:52 +02:00
Blood-Asp
e340d17337
Improved Neutronium for being highest tier material
2016-06-19 19:55:22 +02:00
Blood-Asp
537d6e9330
changed plasma turbine damage and added config
2016-06-19 19:43:14 +02:00
Blood-Asp
96607760e1
EnderIO Wrench Support
2016-06-19 18:23:28 +02:00
Blood-Asp
183a681d52
IC2 Single-Use battery support
2016-06-19 17:36:54 +02:00
Blood-Asp
3a249d8075
Merge pull request #500 from Muramasa-/DieselGenerator
...
Large Diesel Generator
2016-06-19 17:12:23 +02:00
Logan Perkins
54ae577be0
Make recipe input work for split stacks
2016-06-12 10:41:52 -07:00
Muramasa
237e5e682d
Possibly final commit
2016-06-01 06:34:33 +01: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
2cad97e975
Fixes #507
2016-05-24 22:02:46 +01:00
Muramasa
0fadfa2543
Fixes #501
2016-05-24 21:37:46 +01:00
Muramasa
960087a0a8
Cleanup + Improvement
2016-05-23 18:15:21 +01:00
Dream-Master
e806860390
Ethanol fix
2016-05-22 20:09:31 +02: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
Muramasa
4fdbf01fae
My client likes to uncheck files
2016-05-20 05:37:43 +01:00
Muramasa
8880eb8d6d
Basically a rewrite
2016-05-20 05:36:32 +01:00
Dream-Master
7e4aecb65f
Change Neutronium Material and add Droconium EFB recipes.
2016-04-30 20:04:07 +02:00
Muramasa
4a59d0efbd
Implemented Output Calculation
2016-04-29 07:31:58 +01:00
MauveCloud
b69385d29b
Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into experimental
2016-04-28 11:30:29 -07:00
MauveCloud
9036858017
Improved output bus handling
2016-04-27 17:31:20 -07:00
Muramasa
97eb99bd5d
Main Commit for Large Diesel Generator
2016-04-28 00:58:55 +01:00
Blood-Asp
5c8eec846d
Merge pull request #493 from Muramasa-/TurbineCasingRebalance
...
Turbine casing rebalance
2016-04-27 21:18:29 +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
12a1d1c46e
Main Commit
2016-04-19 23:17:31 +01:00
Technus
c68814f780
Adding Multismelter paraller count info to scanner,
...
Adding EBF Heat Capacity to scanner,
reformatting rest of scanner msgs to be unified
2016-04-17 13:08:19 +02: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
Dream-Master
2b96b3ce9c
Draconium needs now new Coils
2016-04-16 22:07:33 +02:00
Technus
3a83a35433
Visualy paintable un-insulated wires
2016-04-16 16:25:45 +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
3aae928510
Added Assembly Line Multiblock
2016-04-11 21:47:53 +02:00
Draknyte1
523d2c449e
Should fix any issues.
2016-04-11 20:34:56 +10:00
Technus
7a047d977a
Update GT_Utility.java
2016-04-10 12:09:28 +02: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
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
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
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
Dream-Master
975f9c718f
Add more Large Fluid Cells
2016-04-02 14:19:59 +02:00
Dream-Master
f2876a31a3
Try to add a new Fluid Cell to GT
2016-04-02 13:06:18 +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
Blood-Asp
af20a2e4ab
Show all ingot fluid extractions and all iron/copper arc furnace recipes
2016-03-27 17:50:10 +02:00
Blood-Asp
44f3e89bdf
Rebalance oil processing and improve pipe covering
2016-03-27 16:43:03 +02:00
Dream-Master
7218ee8e9e
Cobalt need EBF
...
Change to lv 5
2016-03-22 00:20:53 +01:00
Blood-Asp
b2ac24e85a
Tooltip fix
2016-03-20 17:08:33 +01:00
Blood-Asp
009c032c13
Hiding of Recycling recipes and unneeded ores in NEI
2016-03-20 16:47:17 +01:00
Dream-Master
ae58de2708
rotors machine recipes.(Blood Asp)
2016-03-20 13:30:02 +01:00
Blood-Asp
c7c8ba7020
More work on tool hardening
2016-03-20 01:23:03 +01:00
Blood-Asp
f4b8aa6f3a
Add Fluid Filter and Regulator covers
2016-03-19 20:51:20 +01:00
Blood-Asp
c1f5c8c354
Added machine recipe for rotors, added silicone soft hammer
2016-03-18 23:05:38 +01:00
Blood-Asp
e8f0482b16
Dynamite impcomp and fluid mox fixes
2016-03-18 22:43:22 +01:00
Blood-Asp
a80e44f7f5
Added sharpness enchantment for HSS material tools
2016-03-17 00:49:47 +01:00
Blood-Asp
0a6e69e254
Rised crop root length to match IC2 again
2016-03-16 23:52:52 +01:00
Blood-Asp
9e7f34a12f
Fix heavy oil gen without messing everything up
2016-03-16 22:49:15 +01:00
Dream-Master
c1fd3d5800
Merge remote-tracking branch 'origin/Teteros/Recipes'
2016-02-10 22:51:09 +01:00
Dream-Master
04b5d32fe0
Added Thaumcraft Void Metal to GT
2016-02-10 22:50:21 +01:00
Blood-Asp
a475c87f17
Fixed heavy oil not generated
2016-01-30 14:39:08 +01:00
Teteros
d718cac331
Modify Wet Concrete to be able to use cells
...
Wet Concrete was lacking cell support as it was a 'molten' fluid type.
This patch adds a new type 'wet', which replaces 'molten'
for Concrete. This means with this patch you can either use
the canner with concrete dust to fill the cell, or the fluid
canning machine to input or output Wet Concrete.
Ideally Wet Concrete would be separate from Concrete as one is solid and
the other fluid, but they were kept together for compatibility with
existing recipes. 1 Concrete Cell = 144 Wet Concrete = Concrete Block
'Wet' fluid type can be used anytime you'd like both solid and fluid
cell support, as these were usually separate for good reasons.
Mostly to prevent the awkward ratio above.
2016-01-14 06:14:53 +00:00
Blood-Asp
4537392c10
Reserving Meta IDs
2016-01-10 14:18:16 +01:00
Dream-Master
4e96c8325f
Fix forestry worktable crash(Blood Asp)
2016-01-05 21:02:58 +01:00
Dream-Master
1f4f33837d
fix Platinum derp #437
2016-01-05 21:00:28 +01:00
Blood-Asp
874dfdc309
Fix forestry worktable crash
2016-01-03 16:49:00 +01:00
Blood-Asp
5fd2db9ef2
spelling fixes and chainsaw + forestry leaves fix
2016-01-03 05:27:51 +01:00
Blood-Asp
cf69a7f392
Explosives rework
2016-01-03 02:16:02 +01:00
Dream-Master
d741647dbe
Now Mox cells working like in ic2
2015-12-30 01:05:10 +01:00
Dream-Master
e9754ee222
add missing EBXL recipes. tmp disable modular armor recipes(Blood Asp)
...
AE2 oredict register fix(Blood Asp)
fix depleted mox crashing(Blood Asp)
Bump to 5.08.33.3
2015-12-29 15:29:46 +01:00
Blood-Asp
9362235140
fix mox output not rising with heat
2015-12-29 14:42:13 +01:00
Dream-Master
faa4c18f63
Added Blood Asps commits.
...
New debug lang for achievements generation(miuirussia)
fuel rod override v2(Blood Asp) Mox not working lik ic2 any more (more heat up more eu)
Overriding IC2 fuel rods(Blood Asp)
fix teleporter(Blood Asp)
Sensor kit should not stack(Blood Asp)
Fix teleporter nuclear control support(Blood Asp)
Fixed Display overflow(Blood Asp)
2015-12-28 21:04:13 +01:00
Blood-Asp
f0d8454123
fix armor textures and init
2015-12-28 17:17:52 +01:00
Blood-Asp
1e13709399
fuel rod override v2
2015-12-25 15:09:22 +01:00
Blood-Asp
68a19fd70c
Overriding IC2 fuel rods
2015-12-25 14:37:56 +01:00
Dream-Master
af2f74dada
increase hot coolant energy output 4x (Blood Asp)
...
Fix reprocessing exploit (Blood Asp)
2015-12-22 11:42:39 +01:00
Blood-Asp
a9aac6ff58
comb processing fixes
2015-12-21 19:44:23 +01:00
Blood-Asp
9781ccd9ee
fix crash without rf api
2015-12-21 18:44:07 +01:00
Blood-Asp
30749ffeba
Made UUM Berry drop chance a bit lower
2015-12-21 16:36:42 +01:00
Blood-Asp
a7176a293c
Fix reprocessing exploit
2015-12-21 16:30:46 +01:00
Dream-Master
26c684ce02
remove this from Gt Code
2015-12-17 13:10:19 +01:00
Blood-Asp
2bf2ecc35e
Sensor kit should not stack
2015-12-13 17:56:22 +01:00
Blood-Asp
8722e0e2f2
Fixed Display overflow
2015-12-13 17:35:07 +01:00
Dream-Master
27ee4e8635
Test commit to put Core Mod Items into GT code.
2015-12-13 11:52:02 +01:00
Blood-Asp
02e556598e
fixed ore achievements not working with custom ores
2015-12-10 21:02:37 +01:00
Blood-Asp
6b2e08b2ca
shift + screwdriver for all covers
2015-12-10 18:25:07 +01:00
Blood-Asp
2d6d8de484
clean up crop classes
2015-12-10 15:30:18 +01:00
Dream-Master
55ed43f4ce
Added all fixes from Blood Asp we need. Just stay at Forestry 3.6.12.3
2015-12-10 01:12:42 +01:00
Blood-Asp
8176a5fca9
cable burn fix and ihl compat fix
2015-12-08 23:39:41 +01:00
Blood-Asp
8078bca4b3
Moved Sulfide ore processing from IHL to GT
2015-12-06 22:37:25 +01:00
Blood-Asp
27b978f0bb
tmp issue fix
2015-12-06 21:20:23 +01:00
Blood-Asp
aeb505273b
Saving pumped oil amounts in chunk NBTs
2015-12-06 21:15:41 +01:00
Blood-Asp
66427b2178
fix fluidstack memory overflow
2015-12-06 18:37:10 +01:00
Blood-Asp
ef10c47d76
bunch of fixed
...
Added new multiblock guis
shortend HP turbine name to fit gui
added reinforced block reprocessing
fixed crash on AE2 removal
expanded large boiler tooltips
fixed chinsel marble processing
added some recipes for alloys
2015-12-06 07:26:06 +01:00
Blood-Asp
1ef11f2ae4
More recycler blacklisted items and ignored additional oredict because of crossmod issue
2015-12-05 00:55:46 +01:00
Blood-Asp
a625088776
Fix BasicMachines accepting wrong items in certain conditions
2015-12-05 00:33:52 +01:00
Blood-Asp
3106bfe8a2
Fix CarbonDioxide, lower outputstacksize by screwdriver + shift and hide blocks without materials
2015-12-04 22:44:27 +01:00
Blood-Asp
c79c21aa00
Rebalanced oil/fuel burn values to fit more complex processing
2015-11-30 02:37:05 +01:00
Dream-Master
ae4ec23ece
fix name
2015-11-15 22:42:07 +01:00
Dream-Master
f11e8300f2
some fixes again
2015-11-14 13:40:35 +01:00
Dream-Master
ea644f2168
Rename GalgadorianMetal to Galgadorian
...
Rename EnhancedGalgadorianMetal to EnhancedGalgadorian
2015-11-14 01:17:16 +01:00
Dream-Master
438d5f39d3
Adding Reinforced Galgadorian and Enhanced Galgadorian to the Material List from GT
...
Adding Blast Furnace recipes for these materials
Change recipes that Lava gives Tungstate Dust instead of Tungsten Dust
2015-11-14 00:32:58 +01:00
Dream-Master
694a087c75
Integrated Ender IO Alloys into GT (EBF, Mixer, Shapeless)
2015-11-10 16:35:54 +01:00
Dream-Master
732172cce8
Ardite no EBF recipe
2015-11-03 12:36:39 +01:00
Dream-Master
e4859f2a1f
change Material List again
2015-11-03 11:55:38 +01:00
Dream-Master
979a6fb543
Change Material List
...
Adding Planets Oremixes to the lang file
change build properties
2015-11-03 11:28:31 +01:00
Blood-Asp
571a8abbe0
Added new crop drops and processing recipes.
2015-11-01 02:47:32 +01:00
Blood-Asp
bc86770624
added config to disable crops
2015-11-01 01:57:09 +01:00
Blood-Asp
29fade51aa
Forestry update + bee nerv
2015-10-29 00:37:04 +01:00
Blood-Asp
8d8594dabd
GT Wrench now implements Buildcrafts Wrench IToolWrench
2015-10-25 23:56:58 +01:00
Shawn Buckley
756e7edc64
Fix version for stable build
2015-10-24 13:45:06 -04:00
Blood-Asp
2d7a108727
fixed naquadah cell reverse processing
2015-10-24 13:41:56 -04:00
Blood-Asp
a2ad9c9e83
fixed naquadah cell reverse processing
2015-10-24 18:41:53 +02:00
Blood-Asp
8f851f0f68
Made Materials human readable again
2015-10-24 17:32:16 +02:00
Shawn Buckley
123aa6ed28
Reformat code
2015-10-21 22:15:09 -04:00
Shawn Buckley
9353aa711b
Reformat code
2015-10-21 22:06:25 -04:00
Shawn Buckley
445e6c3f25
Replace T/F with builtin boolean values
2015-10-21 22:01:39 -04:00
Shawn Buckley
c68e84f1e2
Remove jdgui-comments
2015-10-21 21:11:56 -04:00
Shawn Buckley
34ecdfb190
Replace homegrown character comparision for builtin ones
2015-10-21 20:58:55 -04:00
Shawn Buckley
bea4cfc545
Bring in experimental branch
2015-10-21 20:47:13 -04:00
Shawn Buckley
1185424fa7
Move source files
2015-10-21 20:46:52 -04:00
Blood-Asp
57efa552e7
Merge pull request #253 from JonnyNova/tf_squash
...
Replace GT_Values.T/F with java primitive boolean values
2015-10-20 22:47:09 +02:00
Shawn Buckley
49e6015068
Replace GT_Values.T/F with java primitive boolean values
2015-10-19 20:48:52 -04:00
Shawn Buckley
7150103150
Replace homegrown character comparision for builtin ones
2015-10-19 19:49:28 -04:00
Shawn Buckley
85c804fa11
Move source directory
2015-10-18 23:04:39 -04:00
