Commit graph

2080 commits

Author SHA1 Message Date
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
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
739a7c7bf7 bump version 2017-01-14 11:05:52 +01:00
Dream-Master
0c035f2159 Oil and Fuel nerf by 25% @Drobac 2017-01-14 11:05:35 +01:00
John
90442a8d91 check that miner can't move down 2017-01-14 04:11:13 +05:00
John
c39c6f8bea Merge pull request #4 from Blood-Asp/unstable
update
2017-01-14 04:05:25 +05:00
Muramasa-
5c5aad4522 Adds IC2 machine recipes to GT machines, needs testing 2017-01-13 21:35:18 +00:00
Dream-Master
244174e2fd bump version 2017-01-13 15:29:52 +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
Dream-Master
4cc2a9dcc6 bump version 2017-01-12 08:14:03 +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
vlad20012
5af9a6718c Fix #816 obfuscated field name 2017-01-10 11:34:46 +03:00
vlad20012
095275bb36 Fix #851 2017-01-10 11:20:35 +03: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
Blood-Asp
8cb644066b Merge pull request #845 from KpoxaPy/issue-829
Fix #829 — Wrong output range in Tooltips
2017-01-06 16:16:01 +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
facd22b08e bump version 2017-01-05 20:04:32 +01:00