Commit graph

1039 commits

Author SHA1 Message Date
Technus
fce26cd0be Make pyrolyze to use our casing (fixes texturinig) 2016-10-20 12:16:54 +02:00
Technus
df0bbb681e Truncate ( ) 2016-10-20 10:35:35 +02:00
Technus
f7a2e14e4e Remove Character.ValueOf 2016-10-19 23:52:37 +02:00
Technus
18591167d9 Pyrolyze works, soft Hammer->soft Mallet changes too 2016-10-19 21:25:17 +02:00
Technus
5849d99645 Texture changes 2016-10-19 16:05:06 +02:00
Technus
6e713952dd Trinium added, removed ez-mode Naquadah alloy, added recipes for duranium and tritanium 2016-10-19 14:57:15 +02:00
Technus
4880244781 Add duranium and tritanium 2016-10-19 11:03:56 +02:00
Technus
f7e8404602 Changes to scaner (will i ever stop...)
added some neat mechanics to proc array (some possibility to utilize tier 10+ machines)
2016-10-19 10:23:50 +02:00
Dream-Master
6ad32da70f change recipes for Field Generator (Tier balance)
fix #740
2016-10-18 22:49:42 +02:00
Technus
6bde470319 Merge branch 'experimental' into Some_Blood_Asps 2016-10-18 11:46:24 +02:00
Dream-Master
bdfad8c2fa change voidmetal to void. Hopfully fix issue in Thaumcraft 2016-10-17 22:01:48 +02:00
Blood-Asp
e957422390 Give ore Achievements from all ore stone types 2016-10-17 14:36:30 +02:00
Blood-Asp
14304fceb8 Exploding GT machines now drop randomly some of their crafting components. 2016-10-17 13:46:08 +02:00
Dream-Master
bf25038fc1 remove png 2016-10-16 00:27:52 +02:00
Dream-Master
2e8778e1c9 remove because to make sense 2016-10-16 00:27:20 +02:00
Dream-Master
abea0b3e1c add and try this 2016-10-16 00:09:35 +02:00
Dream-Master
8c24ed1a72 add png 2016-10-15 23:52:13 +02:00
Dream-Master
f2d3d63c9f add Carbon Dioxide Texture and Code 2016-10-15 23:51:57 +02:00
Technus
1e7ae11490 Minor tweaks 2016-10-15 19:55:44 +02:00
Technus
e13dd8a257 Neat features added to batt buffers and chargers 2016-10-15 19:50:19 +02:00
Technus
4b2a6a360b high tier stuff require more Nq and Nq alloy cable instead of wire... 2016-10-15 14:05:38 +02:00
Blood-Asp
f928c22ad8 Fixed charcoal pile igniter bug 2016-10-14 11:08:56 +02:00
Technus
b9b08ce9c4 disable fail particles 2016-10-14 11:08:41 +02:00
Blood-Asp
c15fd5b855 drop items from exploding gt machines + config 2016-10-14 11:07:12 +02:00
Blood-Asp
e2b3a7dbb6 Optimize hiding of fluid extraction recipes. 2016-10-14 11:05:16 +02:00
Blood-Asp
fe4a38b5b1 Alloy energy hatch in every slice of the assembly line 2016-10-14 11:05:08 +02:00
Blood-Asp
c11d921166 Return slabs on paper craft(this time without bug) 2016-10-14 11:01:17 +02:00
Technus
1bdac81194 notes on the statuses 2016-10-14 11:00:26 +02:00
Technus
b44172b92f another fail 2016-10-13 13:13:34 +02:00
Dimach
07f8b0d348 Fixed fluid regulator. 2016-10-08 19:33:59 +02:00
Technus
9e2b2f2015 added nausea 2016-10-08 19:32:51 +02:00
Technus
36752e1333 Some another attempt 2016-10-08 14:29:42 +02:00
Technus
2ea962f4e4 Unifying more 2016-10-08 13:38:41 +02:00
Technus
be8de36335 INDENTS 2016-10-08 13:30:01 +02:00
Technus
d8fd2c020b Changed chunk coordinate to unified >>4 metod 2016-10-08 13:22:04 +02:00
Technus
61a01ce3ea Removed unused variable, fixed gt small ores textures? 2016-10-08 10:32:51 +02:00
Technus
be22a87f84 Optimize imports (Intelli J) 2016-10-08 09:58:24 +02:00
Technus
6f298ec378 Adding one mising dependency from bloodasp code 2016-10-07 18:50:35 +02:00
Muramasa
bd49408e97 GT crop nerf and separate comb nerf config 2016-10-07 18:48:33 +02:00
Technus
ba9b32d131 HARD CHANGES 2016-10-07 18:44:18 +02:00
Technus
aa45343168 common directory changes from bloodasp code 2016-10-07 18:43:14 +02:00
Technus
c4a0de6674 gt api directory change from bloodasp code 2016-10-07 18:23:54 +02:00
Technus
8b9fdcf4f6 Machine code changes from bloodasp code 2016-10-07 18:08:46 +02:00
Technus
f5278e72cd Another render change from bloodasp code 2016-10-07 18:06:08 +02:00
Technus
5624203a18 Gui and rendering changes from bloodasp code 2016-10-07 18:01:33 +02:00
Technus
999be045f9 Loaders from bloodasp code 2016-10-07 17:58:04 +02:00
Technus
37c6d2407a Covers from bloodasp code 2016-10-07 17:53:22 +02:00
Blood-Asp
a8a3db1d37 Removed unused material + some minor string change 2016-10-07 11:18:15 +02:00
Blood-Asp
98f1ffe6ea Removed ToDos 2016-10-07 10:34:50 +02:00
Technus
b9603b50ca Added textures. 2016-10-05 15:12:32 +02:00
Technus
5e20833305 Might be better attempt to make it work... 2016-10-05 14:35:55 +02:00
Technus
7f057b2e58 This didnt Work 2016-10-05 12:36:20 +02:00
Technus
c18f0e7e5c White spaces 2016-10-04 14:29:05 +02:00
Technus
475f8ad676 Fising WTF 2016-10-04 09:17:13 +02:00
Technus
784bdb0189 Merge branch 'Pollution-code' of https://github.com/GTNewHorizons/GT5-Unofficial into Pollution-code 2016-10-04 08:54:55 +02:00
Technus
adaadb6236 Scanner reformatting 2016-10-04 08:54:45 +02:00
Dream-Master
a5852965aa Change Conductive Iron Recipe using Silver instead of Titanium 2016-10-03 18:32:45 +02:00
Technus
8dd52df459 I have no idea why it is there 2016-10-03 15:50:34 +02:00
siriulx
8289b5676e Fix a typo error. 2016-10-03 13:21:46 +02:00
siriulx
bedbb5503f Fix the MKII Fusion Casing Recipe 2016-10-03 13:21:38 +02:00
Technus
b04fde4b2d Merge branch 'Pollution-code' of https://github.com/GTNewHorizons/GT5-Unofficial into Pollution-code 2016-10-03 13:07:33 +02:00
Technus
afceea0b1d Missing text 2016-10-03 13:07:15 +02:00
Dream-Master
d6a747940c added Carbon Fiber recipes back and add one more
fix #721
2016-10-03 12:46:58 +02:00
Technus
e611809fdd added todos 2016-10-03 12:18:27 +02:00
Technus
f21b9d6e82 Merge branch 'Pollution-code' of https://github.com/GTNewHorizons/GT5-Unofficial into Pollution-code
# Conflicts:
#	src/main/java/gregtech/common/GT_Pollution.java
2016-10-03 12:15:00 +02:00
Technus
0eca98c112 Not working particle spawning need to move it 2016-10-03 12:13:20 +02:00
Technus
3fe36ca604 Pollution changes 2 2016-10-03 12:11:52 +02:00
Technus
f87d016767 Pollution changes 2016-10-03 12:09:42 +02:00
Dream-Master
b39edb00ad fix 2016-10-03 12:04:08 +02:00
Technus
21c62c1848 Less annoying pollution 2016-10-03 01:24:40 +02:00
Technus
5eb2065bd5 Fixed pollution so it actually affects entities 2016-10-03 01:20:33 +02:00
Dream-Master
5bdc9e7ea4 change Coal Fiber recipes 2016-10-03 00:03:36 +02:00
Technus
0effc7b770 Optimized scanner a bit 2016-10-02 22:08:15 +02:00
Technus
2d2fecf6a7 This way is better 2016-10-02 22:00:32 +02:00
Technus
53e33d976a Added pollution info 2016-10-02 21:49:01 +02:00
Technus
452b91cdfc Pollution - added units 2016-10-02 21:07:30 +02:00
Technus
552f4c08f8 More BBF pollution 2016-10-02 20:54:17 +02:00
Technus
1c4d6851c2 Better balance of pollution, adjusted timer 2016-10-02 20:42:52 +02:00
Technus
dab1447798 Derp, changed color 2016-10-02 20:28:34 +02:00
Technus
3198eec498 Pollution info on muffler 2016-10-02 20:27:56 +02:00
Technus
97cafed13b Numbers Crunched For Simulated Pollution 2016-10-02 20:14:14 +02:00
Technus
2607649cf6 Lesser numbers for pollution 2016-10-02 18:02:36 +02:00
Dream-Master
4b5d7225e2 add Ores to Infinity Infinity Catalyst and Bedrockium 2016-10-02 17:55:12 +02:00
Technus
c9cf78f268 Pollution buff (yeah better like that) 2016-10-02 17:49:12 +02:00
Technus
59631856e9 Pollution buff, and another scanner change 2016-10-02 16:48:08 +02:00
Technus
52e01b8666 Nerf Muffler 2016-10-02 16:08:31 +02:00
Muramasa
20de4c922d Fix pollution onWorldTick server crash 2016-10-02 15:30:28 +02:00
Blood-Asp
fb575ddeab Pollution Bloodasp3 2016-10-02 15:29:37 +02:00
Blood-Asp
7e720fc214 Pollution Bloodasp2 2016-10-02 15:27:03 +02:00
Blood-Asp
7718e97e09 Pollution bloodasp1 2016-10-02 15:15:44 +02:00
Technus
994896d763 Scanner cleanup 2016-10-02 15:06:42 +02:00
Technus
451e405055 Scanner fix 2016-10-02 14:42:42 +02:00
Technus
101e5170d7 Readd pollution done 2016-10-02 14:23:41 +02:00
Technus
eac8e5884a Revert "remove pollution too"
This reverts commit a280813749.
2016-10-02 14:14:38 +02:00
Technus
965273acea Revert "remove empty class"
This reverts commit 0cc91372f9.
2016-10-02 14:14:25 +02:00
Technus
86a53b05a8 remove oregen spam 2016-10-02 13:36:34 +02:00
Technus
b5ee460067 Teleporter3 2016-10-02 13:23:09 +02:00
Blood-Asp
c09ebb9e9b Teleport2 and readd null checks on tools 2016-10-02 13:13:07 +02:00
Technus
cc89c94527 Merge branch 'Testing-new-Commits' of https://github.com/GTNewHorizons/GT5-Unofficial into Testing-new-Commits 2016-10-02 13:09:18 +02:00
Blood-Asp
8261ada817 Teleport1 2016-10-02 13:09:07 +02:00