Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions
1503 commits 8 branches 203 tags 97 MiB
Commit graph

1172 commits

Author SHA1 Message Date
Blood-Asp
61dcb99966 Fix ignored oredict names list not working 2016-11-01 13:20:37 +01:00
Technus
6417c403ad Tweak numbers to match max values from bloodasp 2016-11-01 11:10:05 +01:00
Technus
02cbc57444 Some number tweaks. 2016-11-01 00:24:28 +01:00
Technus
8155db316e Nerf radon recipe 2016-10-31 23:37:08 +01:00
Dream-Master
c37abf34d3 Paper needs Water to be made. 2016-10-31 23:02:39 +01:00
Technus
740779b8ad Fix for oil rig fix. operator precedence 2016-10-31 22:14:45 +01:00
Technus
9fa7776929 FIX for oil rig ... 2016-10-31 21:31:53 +01:00
Technus
52c72e9408 Merge branch 'experimental' of https://github.com/GTNewHorizons/GT5-Unofficial into experimental 2016-10-30 16:29:08 +01:00
Technus
e6715ee301 Remove supress warnings 2016-10-30 16:28:27 +01:00
Dream-Master
0f529d90f3 Add Copper to RedAlloy 2016-10-30 16:25:47 +01:00
Technus
6b9799d64c Some work on muffler pollution particles. Need new "yam core" and "core mod" 2016-10-30 15:55:51 +01:00
Technus
b5686c2651 The true and ultimate auto-maintenance fix for servers (checked works) 2016-10-30 12:20:47 +01:00
Blood-Asp
c30e62421f Fix random sound bug 2016-10-29 12:43:16 +02:00
Technus
13c99700cf Teleporter and missing texture 2016-10-29 12:27:36 +02:00
Blood-Asp
4cab8a31e5 Things on auto maintenance 2016-10-28 00:09:40 +02:00
Technus
d85a01caad Revert "Hopefully fixes Auto maintenance on servers (still works on ssp)" 
This reverts commit df0264a9ab.
 2016-10-27 23:55:28 +02:00
Technus
1cf608fe14 Revert "Fix for constant material consumption in auto maintenance hatch" 
This reverts commit 4caeb9ae60.
 2016-10-27 23:55:14 +02:00
Technus
11a7a93c46 Revert "Being a retard...." 
This reverts commit 2cb81309e3.
 2016-10-27 23:54:42 +02:00
Technus
7be8edc138 Revert "Just to be sure" 
This reverts commit 2878f4e5a3.
 2016-10-27 23:54:30 +02:00
Technus
2878f4e5a3 Just to be sure 2016-10-27 23:21:10 +02:00
Technus
2cb81309e3 Being a retard.... 2016-10-27 19:41:33 +02:00
Technus
4caeb9ae60 Fix for constant material consumption in auto maintenance hatch 
199 bugs in the code, Fix one bug, 254 bug in the code
 2016-10-27 19:29:34 +02:00
Technus
df0264a9ab Hopefully fixes Auto maintenance on servers (still works on ssp) 2016-10-27 19:19:48 +02:00
Blood-Asp
54951ee203 Fix super fuel in boilers 2016-10-27 17:19:03 +02:00
Technus
25dd4bccef Remove redundancy 2016-10-27 12:13:54 +02:00
Blood-Asp
a2e1615af3 Sense tool fix 2016-10-27 10:17:01 +02:00
Blood-Asp
d8aa0e6ebf Replace not working localization function with own map. 2016-10-27 10:14:21 +02:00
Blood-Asp
508c229340 Fluid Regulator code optimization 2016-10-26 18:28:11 +02:00
Technus
971e770219 Revert "GT CODE DOESNT LIKE "this" anywhere" 
This reverts commit 264f181081.
 2016-10-26 18:26:13 +02:00
Technus
264f181081 GT CODE DOESNT LIKE "this" anywhere 2016-10-26 12:04:03 +02:00
Technus
41c1d2bd15 Another change in pollution particle generators 2016-10-26 11:33:38 +02:00
Blood-Asp
d30982f327 Muffler fix and turbine ore dict? 2016-10-26 10:04:10 +02:00
Technus
299c54f6b2 Things and stuff about pollution 2016-10-25 22:04:14 +02:00
Blood-Asp
b476b0d54a Initial port of pollution changes from bloodasp 2016-10-25 21:31:51 +02:00
Technus
a70e237cf8 Fix, slabs no longer given on paper crafting , since we dont use that recipe 2016-10-25 12:01:56 +02:00
Dream-Master
d9b95afd6f change mv emitter suggested by Drobac 2016-10-24 21:28:50 +02:00
Technus
5391eab047 Better Telly textures 2016-10-24 19:59:50 +02:00
Technus
2f048969e9 Some minor info changes 2016-10-24 19:42:36 +02:00
Technus
6dba3f85ce Fix some Dissassembler code 2016-10-24 19:22:49 +02:00
Technus
999462eebd Telly changes. 2016-10-24 19:19:38 +02:00
Technus
9ecccffd94 Optimized overclockedness 2016-10-24 18:11:15 +02:00
Technus
ef5a72fa51 Explosive pollution 2016-10-24 11:18:56 +02:00
Blood-Asp
eea7afb539 Auto maintenance (LuV) and optimization + my texture for it 2016-10-24 11:17:46 +02:00
Technus
0a84e7c5a7 Add .tier to micro wave energy transmitters. 2016-10-24 00:39:24 +02:00
Technus
a087c194bf Pollution real fix 2016-10-23 22:02:26 +02:00
Technus
e4fd14304d Revert "Pollution fix?" 
This reverts commit c1120bf1fa.
 2016-10-23 22:01:11 +02:00
Technus
c1120bf1fa Pollution fix? 2016-10-23 21:22:00 +02:00
Dream-Master
697f4e6ac1 Change recipes for new Naqada 2x and 4x Cells for the Reactor 2016-10-23 11:42:14 +02:00
Technus
8bbfd9124b Remove unused imports 2016-10-23 11:26:24 +02:00
Blood-Asp
742bc2eedf Turbines and Oil Drilling rig now show missing items in GUI 2016-10-23 11:19:01 +02:00
Blood-Asp
ab1d48931d Make machines rotatable with shift rightclick with wrench BloodASP 2016-10-23 11:06:16 +02:00
Blood-Asp
f999e31b5a Fix droping of items when pulling from doublechests 2016-10-23 11:00:03 +02:00
Blood-Asp
c5390a5074 Quick Fixes BloodASP 2016-10-23 10:59:55 +02:00
Blood-Asp
1986494508 Try to move full stack into targed inventory, not single operation. 2016-10-23 10:58:15 +02:00
Blood-Asp
fa1df2a6a8 Added new mode to only check large turbine rotors with need maintainance cover 2016-10-23 10:57:44 +02:00
Blood-Asp
c16c49127d Nq reactor cells, and fix some ass line BloodASP 2016-10-23 10:54:34 +02:00
Blood-Asp
6e1a11cc9a Fix some recipes not working in proc array BloodASP 2016-10-23 10:38:24 +02:00
Technus
2792a78b1b Fix derps? 2016-10-21 14:13:20 +02:00
Technus
a5c6412819 Optimize particles and change spawning code for electric machines 2016-10-21 14:09:23 +02:00
Technus
b4e1c9e7df Nerfs 2016-10-21 13:49:25 +02:00
Technus
17f795ef77 A bit too long 2016-10-21 13:28:06 +02:00
Technus
9326c22227 change Nei Strings... to stop confusion 2016-10-21 13:23:10 +02:00
Technus
3a7acc4b61 Optimized 2016-10-20 14:44:48 +02:00
Technus
552ee57450 HOLY SHIT I DID IT (the ez way not like namikon told me to do...) Mullfers now generate pollution particles when the controller is active and there is pollution in the machine 2016-10-20 14:41:45 +02:00
Technus
1d15e8ae8a Pollution effects detects Full hazmat now 2016-10-20 13:17:18 +02:00
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
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
2e8778e1c9 remove because to make sense 2016-10-16 00:27:20 +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
Dream-Master
c9c8184ae0 remove code 2016-10-02 12:46:10 +02:00
Muramasa-
601264e4bf Possible fix for scanner TE error 2016-10-02 12:33:29 +02:00
Dream-Master
32fdda2a18 Rods out of Sticks works again 2016-10-02 11:38:18 +02:00
Dream-Master
8ee5705fb2 Revert "Try this to fix Lathe recipes" 
This reverts commit 2bb5630194.
 2016-10-02 10:54:07 +02:00
Dream-Master
e6c25e86ea Revert "Try this to fix Lathe recipes" 
This reverts commit 26300789bb.
 2016-10-02 10:53:35 +02:00
Dream-Master
26300789bb Try this to fix Lathe recipes 2016-10-02 02:22:12 +02:00
Dream-Master
2bb5630194 Try this to fix Lathe recipes 2016-10-01 23:38:44 +02:00
Dream-Master
b2d63bf110 line fixes 2016-10-01 21:44:50 +02:00
Muramasa
372e5193ba 2f97e5e890 2016-10-01 21:01:00 +02:00
Technus
c3c85319c0 Fixes #714 - solar boiler 2016-10-01 12:06:43 +02:00
Muramasa
2f97e5e890 Fix another dumb mistake 2016-10-01 02:03:29 +01:00
Blood-Asp
761494de6f temporary disable returning of slabs on paper craft because of bug 2016-10-01 00:19:25 +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
aeae594e68 temporary disable returning of slabs on paper craft because of bug 2016-09-30 22:30:30 +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
Blood-Asp
1972ee4076 Count pipe transfers on input not output side 2016-09-29 10:33:31 +02:00
Muramasa-
1806dd0758 fix interdimensional teleport(Blood asp) 2016-09-29 10:32:00 +02:00
Muramasa
4659eb185e Temp fix for missing Greg'd recipes (Muramasa) 2016-09-29 10:21:39 +02:00
Muramasa
c283f7fe36 Temp fix for missing Greg'd recipes 2016-09-29 03:42:44 +01: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
Dream-Master
aad7dba1e5 Processing Ore code changes from Blood asps gt code 2016-09-28 23:09:15 +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
Dream-Master
125201371f try this for rounds 2016-09-28 01:25:38 +02:00
Dream-Master
f3076ed3ba Fix ?! 2016-09-28 01:11:20 +02:00
Blood-Asp
d632ac2ab8 fix interdimensional teleport 2016-09-27 20:31:04 +02:00
Blood-Asp
a6216b8cf0 Count pipe transfers on input not output side 2016-09-27 18:11:19 +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
Dream-Master
55b735fc4f material fix 2016-09-24 00:55:35 +02:00
Technus
e765214bfd Merge branch 'experimental' of https://github.com/GTNewHorizons/GT5-Unofficial into experimental 2016-09-24 00:23:01 +02:00