Commit graph

540 commits

Author SHA1 Message Date
Technus
be22a87f84 Optimize imports (Intelli J) 2016-10-08 09:58:24 +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
8b9fdcf4f6 Machine code changes from bloodasp code 2016-10-07 18:08:46 +02:00
Technus
5624203a18 Gui and rendering changes from bloodasp code 2016-10-07 18:01:33 +02:00
Technus
37c6d2407a Covers from bloodasp code 2016-10-07 17:53:22 +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
8dd52df459 I have no idea why it is there 2016-10-03 15:50:34 +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
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
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
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
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
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
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
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
Blood-Asp
8261ada817 Teleport1 2016-10-02 13:09:07 +02:00
Muramasa-
601264e4bf Possible fix for scanner TE error 2016-10-02 12:33:29 +02:00
Technus
c3c85319c0 Fixes #714 - solar boiler 2016-10-01 12:06:43 +02:00
Blood-Asp
e607bcc020 fix asteroid worldgen 2016-09-30 22:31:16 +02:00
Blood-Asp
928c07b439 Reenable GregTech Capes 2016-09-30 22:31:04 +02:00
Blood-Asp
4fd6c2ae72 Fix fusion reactor not using input fluids. 2016-09-30 22:30:16 +02:00
Blood-Asp
7079dccb8c Fix short distance teleport & readd null check on tools 2016-09-30 22:30:02 +02:00
Dream-Master
d16dc2a23c revert Teleporter code 2016-09-29 10:45:39 +02:00
Dream-Master
9946e218df revert some stuff 2016-09-29 10:44:12 +02:00
Muramasa-
5eef2209fb Possible fix for scanner TE error(Blood Asp) 2016-09-29 10:37:16 +02:00
Muramasa-
1806dd0758 fix interdimensional teleport(Blood asp) 2016-09-29 10:32:00 +02:00
Dream-Master
829c7911aa changes Disel gen text 2016-09-28 23:34:13 +02:00