Commit graph

1378 commits

Author SHA1 Message Date
Technus
f58f2100c3 Merge branch 'experimental' into eM 2017-02-05 12:29:47 +01:00
Dream-Master
b0fcf3eec6 fix
removed wrong line
2017-02-04 10:42:05 +01:00
Dream-Master
1ec6bd84ce grindy but not make sense = now grindy but make sense :) 2017-02-04 10:28:25 +01:00
Technus
9cd786de42 More descriptive 2017-02-02 16:31:01 +01:00
Technus
d28bffb764 Told you dream 2017-02-02 16:27:06 +01:00
Dream-Master
dd65e4c5e8 change Biogas recipe to 1000l out at mv
https://github.com/GTNewHorizons/NewHorizons/issues/1074
2017-02-02 15:32:58 +01:00
Dream-Master
679a820cc3 add plastic out of BioMass back 2017-01-29 22:29:48 +01:00
Technus
fac3fa7301 this should find it? 2017-01-29 09:50:40 +01:00
Technus
f548a49026 not needed 2017-01-29 09:43:16 +01:00
Technus
a5a544c9a4 Make the game crash on wrong config tho. 2017-01-28 14:38:09 +01:00
Technus
8b879e98b4 Add logger 2017-01-28 13:58:47 +01:00
Technus
7dea0b4784 more optimized 2017-01-27 23:37:01 +01:00
Technus
0c74e44a03 fix big diesel EUt with oxygen 2017-01-27 23:35:32 +01:00
Technus
5830850f5b Merge branch 'experimental' of https://github.com/GTNewHorizons/GT5-Unofficial into experimental 2017-01-27 23:11:35 +01:00
Technus
e98f04f6f6 Moved to coremod. 2017-01-27 23:11:07 +01:00
Technus
8dd2dc84b6 Moved to coremod. 2017-01-27 23:10:46 +01:00
Dream-Master
e9f14735ed making an impregnated stick out of a wood log?? very funny 2017-01-27 19:31:21 +01:00
Technus
69415c478b fix ASS line 2017-01-26 23:28:52 +01:00
Technus
5ba4265afd fix ASS line 2017-01-26 23:28:38 +01:00
Technus
2e248365c3 Merge branch 'experimental' into eM 2017-01-25 10:20:29 +01:00
Dream-Master
ac75ed230c change the values a bit 2017-01-23 23:21:21 +01:00
Dream-Master
efee567c36 change BioGas a bit because it was over-nerfed
approved by @Drobac
2017-01-23 22:42:28 +01:00
Technus
57c483db88 add color modulation 2017-01-21 14:22:27 +01:00
Technus
2f30d6cdfa add color modulation 2017-01-21 14:22:10 +01:00
Technus
f3eee1c800 fix top and bottom 2017-01-21 13:59:37 +01:00
Technus
931439a0da Public it 2017-01-21 13:59:32 +01:00
Technus
433f352d82 fix top and bottom 2017-01-21 13:59:18 +01:00
Technus
863bbc44fb Public it 2017-01-21 13:45:54 +01:00
Technus
8a075694c4 Fix casing 2017-01-21 13:32:52 +01:00
Technus
5b61cdec39 Fix casing 2017-01-21 13:32:38 +01:00
Technus
e82a626487 Much better. 2017-01-21 13:14:58 +01:00
Technus
63607b523a Much better. 2017-01-21 13:14:41 +01:00
Technus
7aa0c564d0 Merge branch 'experimental' into eM 2017-01-20 23:49:55 +01:00
John
0b9c783c6a Merge "Miner 2" fix 2017-01-20 23:49:03 +01:00
John
141d90568a Merge "Miner 2" fix 2017-01-20 23:45:05 +01:00
Dream-Master
babb3287cc rename The Blocks to Hermetic Casing
@Technus
2017-01-20 23:33:16 +01:00
Daniel
3cfff200e2 No this is bad... 2017-01-20 23:22:50 +01:00
Dream-Master
d53dc9ed38 first draft of Texture 2017-01-20 12:32:41 +01:00
Dream-Master
1c44b2e954 Tank Block no function only for crafting S and QTanks 2017-01-20 12:12:18 +01:00
Technus
03af99e716 Merge branch 'experimental' into eM 2017-01-19 17:54:14 +01:00
Technus
a8217117fa Actually use this method to do what it does. 2017-01-19 17:53:53 +01:00
Dream-Master
eab5b01037 change Tier names 2017-01-18 23:32:48 +01:00
Technus
8ba0ef316a Merge branch 'experimental' into eM 2017-01-18 17:21:48 +01:00
Dream-Master
9e28a574f6 Merge branch 'experimental' into Chest-and-Tank-2 2017-01-18 10:02:04 +01:00
David Vierra
2c65fddb56 Fix Advanced Miner II occasionally outputting the wrong blocks
AdvMinerII would occasionally output the drops from a block recently
broken by the player. This happens when the wrong coordinates are
passed to GT_Block_Ores_Abstract.getDrops(), which causes it to fail to
find the TileEntity and then fall back to whatever the most recently
broken block was.

Fixes #751 (probably), #674, #508
2017-01-18 10:00:36 +01:00
Dream-Master
13ee7040d6 derp 2017-01-17 22:34:40 +01:00
Dream-Master
580c31a0a1 change Tier and values
Q Chest, S Chest, Q Tank, S Tank
2017-01-17 22:06:31 +01:00
Dream-Master
a0057a081c lang file was already added ?
remove Quantum Tank and Chest recipe from GT code and add it to the Core Mod.
2017-01-17 21:52:20 +01:00
Technus
0958e48f84 Initial by me 2017-01-17 18:33:59 +01:00
Technus
123b852711 Fix #1009 2017-01-17 15:45:12 +01:00
Technus
b9e6b9b16d Fix #1009 2017-01-17 15:38:15 +01:00
Technus
b90943c412 Finally add locale 2017-01-16 21:31:11 +01:00
Technus
256885cc61 Finally add locale 2017-01-16 21:30:53 +01:00
Technus
fb0d2be0e9 Merge branch 'experimental' into eM 2017-01-16 18:31:13 +01:00
Dream-Master
63e863c67b buff gas by 25-30% too 2017-01-15 14:34:42 +01:00
Dream-Master
67aee3565c try to remove catus and hazelnut from Bio Ball 2017-01-15 00:58:13 +01:00
Dream-Master
cd8a188415 fix recipe 2017-01-15 00:01:50 +01:00
Dream-Master
6a60277e52 remove plant ball recipe and add other back 2017-01-14 22:56:08 +01:00
Dream-Master
b80323a04c This works better. remove Bio Chaff out of the macerator 2017-01-14 19:44:31 +01:00
Technus
5f42a1676d air 2017-01-14 17:46:33 +01:00
Technus
c8c81b1286 Revert "airy air"
This reverts commit 79a8234365.
2017-01-14 17:28:25 +01:00
Technus
79a8234365 airy air 2017-01-14 17:28:02 +01:00
Dream-Master
48db0ef366 remove IC2 Bio Chaff recipes 2017-01-14 13:39:24 +01:00
Technus
3c3654cb3c Merge branch 'experimental' into eM
# Conflicts:
#	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
2017-01-14 12:54:44 +01:00
Technus
ba7ab1faca MMK i am done 2017-01-14 12:53:44 +01:00
Technus
14d9d3ad99 Should do it. 2017-01-14 12:35:08 +01:00
Technus
c4eba4d1d7 Nerf all GT Biogassss recipes 2017-01-14 12:20:34 +01:00
Technus
e2948b1ab8 Less evil biogas nerf 2017-01-14 11:46:47 +01:00
Technus
0d70b07a44 Biogas nerf 1 2017-01-14 11:26:38 +01:00
Technus
8d5e424cc6 Merge branch 'experimental' of https://github.com/GTNewHorizons/GT5-Unofficial into experimental 2017-01-14 11:24:12 +01:00
Technus
889d506f09 More airy air 2017-01-14 11:22:11 +01:00
Technus
24bc352a2d Biogas nerf 1 2017-01-14 11:17:41 +01:00
Dream-Master
0c035f2159 Oil and Fuel nerf by 25% @Drobac 2017-01-14 11:05:35 +01:00
Dream-Master
7c66a8b9eb add air texture idea by @mylez 2017-01-13 15:28:48 +01:00
Technus
fca31dd9eb add tier names to scanner 2017-01-12 23:37:31 +01:00
Technus
5723614981 add tier names to scanner 2017-01-12 23:36:42 +01:00
Technus
8e17ef9334 Move texture to core 2017-01-12 22:52:02 +01:00
Technus
eadaa79880 MOOOORE capacity in fluid hatches and fix generator even more 2017-01-11 08:56:24 +01:00
Technus
f3507a0b5c MOOOORE capacity in fluid hatches and fix generator even more 2017-01-11 08:56:06 +01:00
Technus
5d58f4aecc reducing diesel pollution 2017-01-09 23:27:09 +01:00
Technus
7a00537395 reducing diesel pollution 2017-01-09 23:26:52 +01:00
Technus
99a280af58 Duct tape generator fuel issue 2017-01-09 23:23:15 +01:00
Technus
5e2a76eb64 Duct tape generator fuel issue 2017-01-09 23:22:59 +01:00
Technus
92b968f135 Merge branch 'experimental' into eM 2017-01-09 23:05:55 +01:00
Technus
02d872331c Move achievements 2017-01-09 23:05:37 +01:00
Technus
7b11e084ae Move achievements 2017-01-09 23:04:45 +01:00
Dream-Master
d7af401006 fix #965
Blood infused iron plates for glass dagger of sacrafice cant be crafted
2017-01-08 19:27:10 +01:00
Technus
6a6be411ac Merge branch 'experimental' into eM 2017-01-05 21:45:33 +01:00
Dream-Master
a7fd436bc4 centrifuge recipe from infused gold change 2017-01-05 21:20:44 +01:00
Dream-Master
07eb3b42cf remove unused imports. 2017-01-05 20:50:56 +01:00
Dream-Master
28d1b089b3 add centrifuge recipe for infused gold add salis mundus 2017-01-05 20:04:15 +01:00
KpoxaPy
5e7035c8bb Port advanced seismic prospector. 2017-01-05 18:38:25 +01:00
David Vierra
648b4c9562 Fix #830 - Maint Cover does not emit if rotor needs maint
Also change the condition back to 20% durability or less
2017-01-05 18:38:19 +01:00
KpoxaPy
59b2baf3b8 Port advanced seismic prospector. 2017-01-05 18:36:51 +01:00
David Vierra
086a590c53 Fix #830 - Maint Cover does not emit if rotor needs maint
Also change the condition back to 20% durability or less
2017-01-05 18:07:30 +01:00
Technus
6cfe809d4b Merge branch 'experimental' into eM
# Conflicts:
#	libs/GTNewHorizonsCoreMod-1.7.10-1.3.02.jar
2017-01-05 17:59:04 +01:00
Dream-Master
8dbbf23f48 Diesel get a new burn value
Light fuel is 256 heavy fuel 192
2017-01-04 08:56:46 +01:00
Dream-Master
64afb0f43b no message 2017-01-03 19:10:40 +01:00
Dream-Master
d28f4f5798 Change Distillation Tower to hv 2017-01-03 19:08:11 +01:00
Dream-Master
355f419f41 change 32 eu to 30 2017-01-03 06:52:51 +01:00