Commit graph

2112 commits

Author SHA1 Message Date
Technus
4e50d2e375 Merge branch 'experimental' into eM 2017-01-21 13:15:14 +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
74b8b157c2 bump version. 2017-01-20 21:07:20 +01:00
Dream-Master
51ff9805a4 Merge branch 'Tank_Blocks' into experimental 2017-01-20 21:06:46 +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
Muramasa-
37ca6746e3 Adjust process times/eut & steam machine NEI 2017-01-20 04:49:31 +00: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
John
cb4111d405 Merge pull request #5 from Blood-Asp/unstable
Update
2017-01-19 20:59:33 +05:00
Blood-Asp
65c5813ae3 Merge pull request #858 from Techlone/unstable
Disable miner when mining pipes is over
2017-01-19 12:38:50 +01:00
Blood-Asp
1cf283afa8 Merge pull request #857 from vlad20012/fix-816
Fix #816 obfuscated field name
2017-01-19 12:38:37 +01:00
Blood-Asp
e95e832aba Merge pull request #856 from vlad20012/fix-851
Fix #851
2017-01-19 12:38:04 +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
28aba4f9b0 Merge branch 'Chest-and-Tank-2' into experimental 2017-01-18 12:07:01 +01:00
Dream-Master
aba425deec bump version 2017-01-18 10:32:51 +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
36963d700c bump version 2017-01-15 14:35:37 +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
3cfbbae1b7 bump version 2017-01-14 22:58:06 +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