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

232 commits

Author SHA1 Message Date
Muramasa
5fbfa73be9 Update, bump version and Most of TGreg compat fixes 2016-09-27 23:39:42 +01:00
Dream-Master
cc9990c9d0 bump version 2016-09-23 00:00:02 +02:00
Dream-Master
8dae758fda bump version 2016-09-22 23:10:48 +02:00
Dream-Master
aacf36419a bump version 2016-09-20 22:46:43 +02:00
Dream-Master
c637ea6083 bump version 2016-09-09 08:53:27 +02:00
Dream-Master
8250a68c07 bump version 2016-09-09 08:52:50 +02:00
Dream-Master
12c3fbd1e1 bump version 2016-09-03 13:24:25 +02:00
Dream-Master
ee80bb8021 bump version 2016-09-03 00:52:52 +02:00
Dream-Master
f454beec80 bump version 2016-09-02 21:38:28 +02:00
Dream-Master
c1ba7dba21 Naquadah Reactor fixes Part 2 2016-09-01 23:49:16 +02:00
Dream-Master
b7046f9a6e Naquadah Reactor fixes 2016-09-01 23:36:02 +02:00
Dream-Master
5b3748fecd Add 2 more Naquadah Reactors in the Game. 
Tier 2 needs now Naquadah Long sticks

Tier 4 and 5 Needs Naquadria Long rods and naquadria Cells

Tier 1 80%, Tier 2 100%, Tier 3 125% Tier 4 150 % Tier 5 200%

Bolts = 25 Mio Eu
Long Rods 200 Mio EU
Cells 200 Mio EU
Long Rods NQX 500 Mio EU
Cells NQX 500 Mio EU
 2016-09-01 23:11:49 +02:00
Dream-Master
cd3d85849a reneame Infinity to Infinity Catalyst 2016-08-31 07:58:53 +02:00
Dream-Master
eafafb3913 Add Infinity as Material 
Add Gold to Infused Gold as Byproduct
 2016-08-30 09:21:24 +02:00
Dream-Master
cea9f838cb bump version 2016-08-28 01:07:16 +02:00
Dream-Master
292f8a880d Bump version 2016-08-27 23:20:42 +02:00
Dream-Master
388227ed0c add more infused Gold recipes 2016-08-26 18:22:40 +02:00
Dream-Master
39eaf8c194 Added new Infused Gold recipes 2016-08-26 10:00:03 +02:00
Dream-Master
29c0c3342e bump version 2016-08-25 21:17:37 +02:00
Dream-Master
49023ca1c4 remove Teleporter from GT Code 
(Load Order)
 2016-08-25 18:16:15 +02:00
Dream-Master
d696c19411 bump version 2016-08-25 15:42:37 +02:00
Dream-Master
b849c78fe5 Tiered Teleporter to LuV 2016-08-25 13:38:27 +02:00
Dream-Master
7e098d017b Fix #674 
Fusion Casings now  Assembler only recipes
Using new EBF Tiered Materials like HSSS and Naquadah Alloy.
 2016-08-25 13:11:58 +02:00
Dream-Master
5a35be495e change Materials a bit 
Some Metallurgy Metal adds
 2016-08-23 22:57:31 +02:00
Dream-Master
1fc13df510 spell fix 2016-08-23 18:24:41 +02:00
Blood-Asp
0476a03635 update version 2016-08-22 23:06:04 +02:00
Dream-Master
aa33e48c88 Fix Assembly line work without energy(Muramasa) 
Assembly line dont work on Z coordinates.(Muramasa)
 2016-08-22 21:41:44 +02:00
Dream-Master
7a5d9b73d9 Add more mixed Metal Ingot combinations 2016-08-21 22:29:54 +02:00
Dream-Master
ea307b2828 Should fix #666 
Teleporter need Neutronium Block
 2016-08-21 19:08:14 +02:00
Dream-Master
5292ae3479 bump Version 2016-08-20 18:23:49 +02:00
Dream-Master
bc33222dfe bump Version 2016-08-19 21:56:37 +02:00
Dream-Master
b97e82da63 Added most of the Oredict Stuff from the script to GT 2016-08-19 20:20:45 +02:00
Dream-Master
7567cddd18 bump version 2016-08-19 09:19:03 +02:00
Dream-Master
9fa6c9a40e Add new Materials 2016-08-18 14:58:26 +02:00
Dream-Master
fe40e43837 bump version 2016-08-14 23:05:47 +02:00
Dream-Master
e859fb57b3 bump version 2016-08-14 22:37:05 +02:00
Dream-Master
ee007402d8 added new recipe to Compressed Plates. 2016-08-10 23:12:09 +02:00
Dream-Master
cf98730762 Adding Missing Materials to GT for Galaxy Space 1.10 Compat 2.6 2016-08-08 23:04:16 +02:00
Dream-Master
bc0ec20f89 Change recipes for Sensors and Field Generators 2016-08-05 22:57:00 +02:00
Dream-Master
20572d5678 Change some materials. 2016-08-05 16:16:19 +02:00
Dream-Master
5efb45aa2d Remove Low and High Pressure Boiler from RC and add it to the Core Mod 2016-08-05 15:18:16 +02:00
Dream-Master
e6c4150cd9 Change Blast Furnace Temp a bit 2016-08-05 09:44:02 +02:00
Dream-Master
5894cb1e64 Change Emitter Recipes and Fix #649 2016-08-05 00:15:56 +02:00
Dream-Master
52a23cc3b7 bump version 2016-07-27 17:24:11 +02:00
Dream-Master
36825da884 bump version 2016-07-27 17:19:33 +02:00
Dream-Master
e9cae4d26a bump Version 2016-07-27 17:12:22 +02:00
Dream-Master
73c63314ff bump Version 2016-07-26 22:24:42 +02:00
Dream-Master
c71fe0c9a8 bump Version 2016-07-26 19:44:54 +02:00
Dream-Master
ee9a80810a bump version 
Puh a lot of work
(git checkout -b otherrepo-master master
 git remote add upstream git://github.com/xxxxxx
 git fetch upstream
 git checkout master)
 2016-07-25 23:19:06 +02:00
Dream-Master
eeab702de4 Fix Multismelter 
Change Wire recipe and Fix 643
 2016-07-18 22:32:39 +02:00
Dream-Master
c3ccf315a2 Add shaped crafting recipe for springs 2016-07-15 22:35:15 +02:00
Dream-Master
8cb17b20c0 Adding Shaped recipe for small springs 2016-07-15 00:21:18 +02:00
Martin
d7d1542954 bump version 2016-07-13 16:25:57 +02:00
Dream-Master
467f983190 Change Pile Igniter recipe to be LV Steel. 2016-07-04 22:50:39 +02:00
Dream-Master
bdff360684 Change cable to be using rubber instead of wool. 
Added 16X Insulated cables
 2016-07-04 22:14:50 +02:00
Dream-Master
aa35ec7ccd Turbine tooltip fixes(Muramasa) 2016-07-01 09:05:24 +02:00
Dream-Master
02c801afac fix 2016-06-29 08:48:37 +02:00
Dream-Master
1aa93e453b version bum. 2016-06-28 08:50:56 +02:00
Dream-Master
079332af09 bump version 2016-06-27 17:00:04 +02:00
Dream-Master
4046c52835 Change Material HEE Endium 2016-06-26 23:30:14 +02:00
Dream-Master
fc4e0c75b3 remove Bees module 2016-06-25 14:44:34 +02:00
Dream-Master
516d3b56c4 bump version 2016-06-25 11:27:22 +02:00
Dream-Master
fe93065662 Adding Manyullyn to materials 2016-06-24 23:50:15 +02:00
Dream-Master
8a3ed09c46 Blood Asp changes 2016-06-24 01:32:57 +02:00
Dream-Master
ce97f9d852 Fix Fluid Wet Concrete 
remove Plasma Pie we have Neutronium for it.
 2016-06-23 22:33:31 +02:00
Dream-Master
0152aba652 Neutronium Blast Furnace only 2016-06-23 00:10:51 +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
18eb7bc358 Bump version 2016-06-22 23:05:15 +02:00
Dream-Master
a88d9c4e72 experimental branch 2016-06-21 21:07:14 +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
Dream-Master
6fe4d4a8d3 bump version 2016-06-07 16:47:51 +02:00
Dream-Master
15b0446f7e bump version 2016-06-06 22:50:24 +02:00
Dream-Master
0458d25021 bump version 2016-05-30 21:19:52 +02:00
Dream-Master
f56e821c1b Make Stainless Steel more expensive to not skip to quick MV Age 2016-05-28 00:17:38 +02:00
Dream-Master
5c46e9fb88 wrongly remove Code 2016-05-26 00:10:56 +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
Dream-Master
e806860390 Ethanol fix 2016-05-22 20:09:31 +02:00
Dream-Master
d1cd5baed2 Bump Version 2016-05-22 02:16:24 +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
Dream-Master
7e4aecb65f Change Neutronium Material and add Droconium EFB recipes. 2016-04-30 20:04:07 +02:00
Technus
6e38c94b6e Update build.properties 2016-04-18 17:05:03 +02:00
Dream-Master
334b01dac0 fix #466 
Machines higher than IV have a recipe conflict
 2016-04-18 00:48:48 +02:00
Dream-Master
0a5ea5afae fix #565 
Change Motors to have max 4 cable instead of 16
 2016-04-17 22:37:37 +02:00
Dream-Master
843b5e301b Bump version 2016-04-17 17:32:16 +02:00
Dream-Master
c40e2720d2 Bump version 2016-04-16 21:49: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
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
dc6314f396 Adding Draconic Ores and Draconic Awakened Ores to GT code. 2016-04-02 11:53:15 +02:00
Blood-Asp
ff4cfa3933 Update buildscript to add NC2 2016-03-27 19:41:23 +02:00
Blood-Asp
e56a98af45 Update Charcoal pit tooltip 2016-03-27 15:26:36 +02:00
Dream-Master
7218ee8e9e Cobalt need EBF 
Change to lv 5
 2016-03-22 00:20:53 +01:00
Dream-Master
e12d4f87f5 bump version 2016-03-20 23:13:05 +01:00
Blood-Asp
b2ac24e85a Tooltip fix 2016-03-20 17:08:33 +01:00
Dream-Master
481ed8afe7 Forestry Log with meta id >16 are now nerfed by Greg 2016-03-20 13:06:07 +01:00
Blood-Asp
2544d46c91 Fix Forestry woods above meta 15 not effected by wood nerv 2016-03-16 23:49:35 +01:00
Dream-Master
76179293b6 Bump Version 2016-02-10 22:53:47 +01:00
Dream-Master
c8c0a128fb Bump Version 2016-01-06 00:36:04 +01:00
Blood-Asp
63f9e2e457 explosives 2 2016-01-03 02:55:14 +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
87e9feebc3 fix depleted mox crashing 2015-12-29 14:15:32 +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
a9aac6ff58 comb processing fixes 2015-12-21 19:44:23 +01:00
Dream-Master
d9afccdf22 Distillery using now Pipes instead of Blaze Rods. 2015-12-12 08:54:25 +01:00
Blood-Asp
a7c9f96647 fix thaumium block overwritten, cable error without RF api and cells getting eaten 2015-12-10 15:04:23 +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
fec58633e1 version update 2015-12-09 00:11:57 +01:00
Blood-Asp
4fd0a7f473 Fix forestry compatibility and add luber ability to chainsaw 2015-11-28 20:35:20 +01:00
Blood-Asp
063a758961 Mass fabricator fix and Charcoal pit oredict support. 2015-11-25 02:56:23 +01:00
Dream-Master
b0e7ffa8e5 Added T2 and T3 Alloy Ingots to the Assembler 
Change Implosions Compressor Recipes for T2+T3 Ingots
New Version for testing.
 2015-11-20 13:27:06 +01:00
Blood-Asp
0c9361193a GT Bee fix + new crop textures. 2015-11-18 01:32:45 +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
5d3b9496df Disabled Rotors (no texture) 2015-11-05 22:49:24 +01:00
Dream-Master
0c36ac30b7 Backdate to Forestry 3 because using the GT Centrifuge for Bee products too 2015-11-04 20:24:18 +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
29fade51aa Forestry update + bee nerv 2015-10-29 00:37:04 +01:00
Blood-Asp
621573fe84 Fix sulfuric gas texture 2015-10-25 17:24:05 +01:00
Blood-Asp
74dcc79110 Update versions 2015-10-25 13:31:16 +01:00
Blood-Asp
c6863e9aa5 update build v2 
This way compiling works
 2015-10-24 16:03:01 +02:00
Blood-Asp
50016ae707 Tried updating builds. Is this right? 
cofhcore and cofhlib incompatible versions. Codechickencore missing.
Updated to a non broken forge version.
 2015-10-24 14:56:00 +02:00
Shawn Buckley
cda516a3e3 Update to Forestry 4 2015-10-21 21:30:33 -04:00
Shawn Buckley
4548c34055 Update dependencies 2015-10-21 21:13:46 -04:00
Shawn Buckley
90f38a5046 Update forestry 2015-10-20 21:19:02 -04:00
Shawn Buckley
ab0559cba0 Remove unused subversion property 2015-10-19 17:42:07 -04:00
Shawn Buckley
16997a455f Correct build.properties to use Forge 1481 2015-10-19 10:47:11 -04:00
Shawn Buckley
02d954475d Organize build.properties 2015-10-18 22:54:59 -04:00
Shawn Buckley
e4f5504a89 Update dependencies 2015-10-18 22:50:44 -04:00