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

1136 commits

Author SHA1 Message Date
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
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
Blood-Asp
51e1704e5e Remove .bats since Curse does not like them. Take from old builds if needed. 2016-09-28 13:05:02 +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
Technus
b0309a2ebd Remove Shit material 2016-09-24 00:22:26 +02:00
Dream-Master
2f4830b7ab material fix 2016-09-23 20:42:21 +02:00
Blood-Asp
154b13560a Return slabs on paper crafting and add metal subtags to TungstenCarbine, VanadiumSteel, ect 2016-09-23 19:46:13 +02:00
Blood-Asp
6217cca671 Return slabs on paper crafting and add metal subtags to TungstenCarbine, VanadiumSteel, ect 2016-09-23 19:42:42 +02:00
Muramasa
cc20b3d213 Fix missing code block 2016-09-23 19:20:30 +02:00
Muramasa
ec9bd39c02 Fix missing code block 2016-09-23 14:16:53 +01: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
Dream-Master
fd6e25d380 add Mysterious Crystal 2016-09-22 23:55:58 +02:00
Technus
dbdc4f160a Merge branch 'Loading-Times' into experimental 2016-09-22 23:07:35 +02:00
Technus
41a91acd57 Bender derp fix 2016-09-22 23:06:26 +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
Muramasa
1b618500b3 Bool Const Changes 2016-09-22 22:22:30 +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
99a17ad3ef Small fix 2016-09-22 19:26:30 +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
Muramasa
a2b3a33963 Postinit reduction and save registered recipes. 2016-09-22 18:44:29 +02:00
Muramasa
436389d3f1 For Loop Changes 2016-09-22 18:40:19 +02:00
Muramasa
ae471ca1a8 Worldgen and random changes 2016-09-22 18:35:20 +02:00
Technus
676e4c4e91 Made the onFirstTick methods use argument instead 2016-09-22 18:16:31 +02:00
Technus
bd924faa07 Finally working on first ticks on the teleporter and microwaveET's. 
Also minor spelling fix
 2016-09-22 17:50:53 +02:00
Technus
0218bda946 Reauthored bees to GT 2016-09-21 22:22:59 +02:00
Technus
b374cf7a70 Tweaks 2016-09-21 22:22:41 +02:00
Technus
00c69b5a39 Scanner done. 2016-09-21 22:22:29 +02:00
Technus
205fd2bba4 scanner done 2016-09-21 22:22:21 +02:00
Technus
9847f73d98 Work on tiers 2016-09-21 22:22:12 +02:00
Technus
93da2917ed Scanner spacebars O: 2016-09-21 22:21:31 +02:00
Technus
5891c4cb36 Last bit of work on scanner 2016-09-21 22:16:54 +02:00
Technus
0153c13251 Scanner core scanning code changes 2016-09-21 22:16:40 +02:00
Technus
5680bf3cbd More Texture Work 2016-09-21 22:14:51 +02:00
Technus
8059f589c2 textures work 2016-09-21 22:14:43 +02:00
Technus
2242c65161 Scanner initial change 2016-09-21 22:14:27 +02:00
Technus
13f4435a02 Minor changes - fixed derp in string generation 2016-09-21 22:09:51 +02:00
Technus
e9db0f877f Fix Proc even more! 2016-09-21 22:07:55 +02:00
Technus
d02b7925f5 Fixed textures in correct place... 2016-09-21 22:07:48 +02:00
Technus
8f8a0e5ff3 Fixed more texture bug 2016-09-21 22:07:41 +02:00
Technus
43d8044658 Fixed last bug that prevented me from texting 2016-09-21 22:07:34 +02:00
Technus
366a90fd1f more work on ultimat-er battery 2016-09-21 22:07:28 +02:00
Technus
9da4080fea no message 2016-09-21 22:07:21 +02:00
Technus
c5eeb27cd6 Fixing INTEGER.MAX_VALUE culprit.... 2016-09-21 22:07:13 +02:00
Technus
7dfb3e0da9 Adjusting multiblocks for bettter tiering 2016-09-21 22:05:58 +02:00
Technus
222e8ee267 adding method to multibocks 2016-09-21 22:03:16 +02:00
Technus
81dc8a48b1 no message 2016-09-21 22:03:09 +02:00
Technus
66f7ef1cc0 EVEN MORE WORK^2 2016-09-21 22:03:00 +02:00
Technus
d09a81b501 EVEN MORE WORK 2016-09-21 22:02:51 +02:00
Technus
fcae1a1801 Materials update, whitespaces, Higher tier method adjustment for long computaion. 2016-09-21 22:02:16 +02:00
Dream-Master
d8d2a5039a Material changes and names change 2016-09-21 21:59:43 +02:00
Technus
803c0e2bc6 Initial material change and tier expansion. 2016-09-21 21:50:43 +02:00
Dream-Master
0a04741a60 Added some magic Fuels and fixes 2016-09-21 21:36:51 +02:00
Dream-Master
29bff998bc Add Infinity as Material 
Add Cells to Infinity Catalyst, infinity and Bedrockium
 Add more Plasma and Cells to new Materials from GS
 2016-09-21 21:36:42 +02:00