Commit graph

561 commits

Author SHA1 Message Date
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
Dream-Master
d61b120ce4 Adding UBC Support from Blood asps code 2016-09-28 23:31:49 +02:00
Muramasa
7b7e0d8a78 Fix pollution onWorldTick server crash 2016-09-28 08:07:07 +01:00
Muramasa-
0ada20e86f Fixes harvest crash 2016-09-28 05:45:30 +01:00
Blood-Asp
d632ac2ab8 fix interdimensional teleport 2016-09-27 20:31:04 +02:00
Blood-Asp
7074a513ab Pollution configs and first effects 2016-09-27 16:35:03 +02:00
Blood-Asp
16fb901529 More Pollution & bugfixes 2016-09-27 02:00:19 +02:00
Muramasa-
97d7efcc22 Possible fix for scanner TE error 2016-09-26 14:03:20 +01:00
Blood-Asp
380211de8a fix orehiding hiding all ores instead of only the unneeded. 2016-09-24 19:56:58 +02:00
Technus
cffe92cd21 Revert "random code changes"
This reverts commit 92e2c32df6.
2016-09-23 19:26:20 +02:00
Dream-Master
92e2c32df6 random code changes
@Technus can you verifying if this code please
2016-09-23 19:04:27 +02:00
Technus
0bbc311204 Even less spaming scanner 2016-09-23 13:58:19 +02:00
Technus
bcb5902c62 Assline OK 2016-09-23 13:33:06 +02:00
Technus
9b08a7df97 More minor changes 2016-09-23 11:15:08 +02:00
Technus
f341e3327c Some minor change 2016-09-23 11:01:42 +02:00
Technus
5c34b0d4a6 Exposing more recipe adding functionality. 2016-09-23 10:53:45 +02:00
Technus
dbdc4f160a Merge branch 'Loading-Times' into experimental 2016-09-22 23:07:35 +02:00
Blood-Asp
1d56d4fcb6 Proc Fix 2016-09-22 22:45:03 +02:00
Blood-Asp
58d753a5e6 After fix 598 2016-09-22 22:34:36 +02:00
Muramasa
ca620da531 Fixes #561 2016-09-22 22:32:33 +02:00
Muramasa
e8d75e0b40 Fix 559 2016-09-22 22:32:22 +02:00
Blood-Asp
476d65ea9d Fix tools and lag on reading tooltip 2016-09-22 22:26:16 +02:00
Technus
07ea1b18f1 Revert "Change max machine casings to UHV"
This reverts commit 5cfce3ec9f.
2016-09-22 22:11:27 +02:00
Dream-Master
5cfce3ec9f Change max machine casings to UHV 2016-09-22 22:10:32 +02:00
Muramasa
f27a4b9cbb MORE string var changes 2016-09-22 22:09:50 +02:00
Dream-Master
13ba045b34 Change max machine casings to UHV 2016-09-22 20:13:11 +02:00
Muramasa
4378d8c673 Try Catch Changes 2016-09-22 19:26:18 +02:00
Muramasa
04fec51acb Remove null checks 2016-09-22 19:17:44 +02:00
Muramasa
789199a578 Concurrent Hash maps and string vars 2016-09-22 19:10:30 +02:00
Muramasa
c6bc630efc Rest of previous commit 2016-09-22 18:46:07 +02:00