Commit graph

1334 commits

Author SHA1 Message Date
Technus
6d291877d2 EM container. 2016-12-11 20:25:14 +01:00
Technus
85bcc9e49e Commit Stuff 2016-12-11 17:24:01 +01:00
Technus
6225926757 Add item 2016-12-11 16:16:41 +01:00
Technus
302d4fec7f Fix recipes. 2016-12-10 20:56:07 +01:00
Technus
fa98d04d13 Tweak fusion more 2016-12-10 10:05:10 +01:00
Technus
da8d547cfd Tweak Fusion 2016-12-10 09:49:46 +01:00
David Vierra
c8655c6d49 Change Oil Cracker tooltip to match reality (and vice versa)
Oil Cracker only allows Maint/Energy hatches in the middle ring. Input and output hatches can be anywhere on the sides.

Minimum casing count is changed to 18 to match the tooltip, rather than increase the tooltip to 19. This allows two input and output hatches on either side, for when you want to run two cracking recipes with the same cracker.

(It turns out the cracker doesn't care which hatch the inputs and hydro/steam are put into. I don't really care either!)
2016-12-08 22:06:38 +01:00
David Vierra
06636fd149 Fix efficiency penalty incorrectly applied to large gas+plasma turbines
This is a copy-paste error from the original code in the large steam
turbine. `aOptFlow` is the optimal flow rate expressed in EU/t, while
`totalFlow` is expressed in fuel L/t
2016-12-08 22:05:59 +01:00
David Vierra
c0f6a4e77a Fix boosted diesel x9 on things. 2016-12-08 22:05:28 +01:00
David Vierra
6c00cc8849 Diesel Tooltip from bloodasp 2016-12-08 22:00:07 +01:00
Technus
037953a47f Fix emmiter and sensor recipe 2016-12-08 21:47:07 +01:00
Technus
ad6de73748 Remove some more cells 2016-12-06 12:39:59 +01:00
Technus
5611cc7404 Remove Nq+ cells use stick longs instead - also made the last 2 naq reactors more tiered. (the uv needed less processing for fuel...), also cleanum whitespace 2016-12-06 12:27:17 +01:00
Technus
a232fbd842 Remove cell registration. 2016-12-06 12:10:26 +01:00
Technus
badccece12 Fix recipes in mixer (ffs y u no work for HSS-S) 2016-12-06 11:56:22 +01:00
Technus
06b9f0123f Revert "Fix HSS-S mixer recipe."
This reverts commit 8080379bd6.
2016-12-05 12:51:17 +01:00
Technus
8080379bd6 Fix HSS-S mixer recipe. 2016-12-05 12:49:05 +01:00
Technus
9e366cab6b Fixes texture outside Dev Env 2016-12-04 15:20:31 +01:00
Technus
b9db0844dc Laser engraver recipe fix. 2016-12-02 12:30:03 +01:00
Technus
f127d61767 Fix shit 2016-12-01 18:41:01 +01:00
Technus
0291dbd90b May or may not fix wire burning again. 2016-12-01 14:18:04 +01:00
Technus
e5e9ef76eb DERP 2016-11-30 22:49:12 +01:00
Technus
440adbdff3 Fix tinny pipe/wire renderer and add reverse recipes for coils. 2016-11-30 19:20:57 +01:00
Technus
524c49eb75 Nerf just in case 2016-11-30 12:13:17 +01:00
Technus
522cb43434 Also rename material 2016-11-30 12:06:27 +01:00
Technus
22ad077180 WHITESPACE 2016-11-30 11:43:14 +01:00
Technus
392c3a3a7e ducttape fix glue 2016-11-30 11:42:23 +01:00
Technus
dc765d0ff8 Add 1G heat Cap and vent/exchanger vac freezer recipes. 2016-11-29 16:41:03 +01:00
Technus
ea369c718d Fix nq* recipes 2016-11-29 16:39:58 +01:00
Technus
92c4ee48c3 Naqudria MOX 2016-11-29 15:38:45 +01:00
Technus
1e3c2a81a4 On hide item change retexturize pipes. 2016-11-28 14:39:34 +01:00
Technus
025e338c55 Set macerates into properly 2016-11-27 18:13:45 +01:00
Technus
d47a698e19 Add pipe/wire hiding when holding soldering iron. 2016-11-27 12:34:02 +01:00
Technus
3362fe92a7 Fix multismelter scanner info 2016-11-27 12:01:05 +01:00
Technus
fefb9277f1 Small Assline recipe changes and Field generator recipe changes and minor optimization for block render. 2016-11-26 14:08:35 +01:00
Technus
2edb3528ce Removing retardness... 2016-11-26 11:26:37 +01:00
Technus
389267d733 Fix scaling of ItemBlock GT machines in certain scenarios, repostion wire heating info. 2016-11-26 11:02:11 +01:00
Technus
e15eb15fc2 Added oreprocessing for small screws out of rods. 2016-11-25 15:48:35 +01:00
Technus
3dac87a097 Fix fluid detector cover and make casings work more like blocks... 2016-11-25 14:53:03 +01:00
Technus
ee64bac739 Cover name changes and fix for item detector cover 2016-11-25 13:04:44 +01:00
Technus
3425da9e12 Minor string changes 2016-11-25 09:55:53 +01:00
Technus
9bc3ea63dd Optimize imports (IntelliJ) 2016-11-25 01:28:17 +01:00
Technus
50a3dfcd32 Solar nerf of doom 2016-11-25 01:26:23 +01:00
Technus
7f8664b080 Cos it is the proper color... 2016-11-24 21:38:59 +01:00
Technus
045fac94a6 Added gem upgrade recipes to GT
Can now be safely removed from Gregtech.zs
2016-11-24 19:49:55 +01:00
Technus
2a7dcf868b Recipes for assline 2016-11-24 18:44:02 +01:00
Technus
8cd95d6582 Failsafe 2016-11-24 13:01:53 +01:00
Technus
0cedc2195a Achievement based unlocking done. 2016-11-24 12:24:55 +01:00
Technus
a650dc425c Documentation on how to toggle recipe visibility 2016-11-22 21:57:55 +01:00
Technus
2b854dbe1d no message 2016-11-22 21:53:48 +01:00
Technus
18be853366 Add more tooltips. 2016-11-22 20:36:56 +01:00
Technus
317d6062d2 WIP 2016-11-22 19:44:57 +01:00
Technus
2de6e3eadb Stuff 2016-11-22 19:05:12 +01:00
Technus
6f03cd84cd some initial gui work 2016-11-22 16:40:21 +01:00
Technus
b638bc34c3 initial 2016-11-22 12:51:04 +01:00
Technus
c28e02f6f2 Not needed 2016-11-22 12:02:14 +01:00
Technus
93b4069703 What have i done... 2016-11-22 10:09:18 +01:00
Technus
5db214fa74 Fix wire part 2 2016-11-22 09:40:32 +01:00
Technus
f40418336d Merge branch 'experimental' of https://github.com/GTNewHorizons/GT5-Unofficial into experimental 2016-11-22 08:33:31 +01:00
Technus
cc08c02610 Might fix SHIT with wires. 2016-11-22 08:33:17 +01:00
Dream-Master
1669bf61f8 change Charcoal Pile Igniter recipe 2016-11-21 20:28:22 +01:00
Technus
0caffe3365 Scanner Saves stuff 2016-11-21 20:13:24 +01:00
Technus
dcf3083a68 Moare stable fix 2016-11-21 18:46:50 +01:00
Technus
349f1dbe44 Revert "Fix"
This reverts commit 92c22ca681.
2016-11-21 18:43:22 +01:00
Technus
896e03d13b Revert "Not needed"
This reverts commit d5d03c40c1.
2016-11-21 18:43:14 +01:00
Technus
d5d03c40c1 Not needed 2016-11-21 18:34:59 +01:00
Technus
92c22ca681 Fix 2016-11-21 18:32:58 +01:00
Technus
0b9ee3e95a credit 2016-11-21 17:22:05 +01:00
Technus
94c59ae5f8 Not needed i guess. 2016-11-21 16:51:05 +01:00
Technus
004357be5e GT telly WORKS :O 2016-11-21 16:36:02 +01:00
Technus
3d09bacb71 Not needed 2016-11-18 11:57:19 +01:00
Technus
9970cbd6ec Remove some shit code, change some scanner. 2016-11-18 00:56:22 +01:00
Technus
6c6ad68791 Whitespace 2016-11-16 10:32:23 +01:00
Technus
e5c157714d Remove dead code 2016-11-13 19:33:49 +01:00
Technus
2e042088a1 That needed to be done 2016-11-12 22:32:32 +01:00
Technus
26d4e8980e Fix texturing and feature finally done :D 2016-11-12 22:14:18 +01:00
Technus
c6829c5679 Merge branch 'experimental' of https://github.com/GTNewHorizons/GT5-Unofficial into experimental 2016-11-12 21:33:54 +01:00
Technus
556a4ab306 Initial work on pipe/wire boxes 2016-11-12 21:33:47 +01:00
Dream-Master
dd5a500c8e space fix 2016-11-12 20:56:31 +01:00
Technus
98674fe401 not needed 2016-11-12 11:37:14 +01:00
Technus
8564454d58 fix content of duralumin 2016-11-12 11:26:31 +01:00
Technus
4ed9b085ba Nerf some more 2016-11-12 11:05:23 +01:00
Technus
66104d0d97 Add duralumin recipe 2016-11-12 11:02:02 +01:00
Technus
3f39ec12ed Remove coil compat code (only for crafting). 2016-11-11 13:25:04 +01:00
Technus
8be326506a Nerf coils 2016-11-11 13:22:26 +01:00
Technus
319ed74de6 Moved all ebf recipes to coremod 2016-11-11 11:44:33 +01:00
Technus
eea2f89357 More alloys require mixer, why? Cos FU :D 2016-11-11 11:40:45 +01:00
Dream-Master
02c9398433 remove shadow ingot 2016-11-09 20:08:19 +01:00
Dream-Master
a70ffb233e ordict shadow to tainted magic ingots. 2016-11-09 19:18:18 +01:00
Dream-Master
c183b753f0 add Shadow for Tainted magic to GT 2016-11-09 19:14:17 +01:00
Technus
9add9c39ad Little bit more oil, might be better for precision? 2016-11-07 20:49:46 +01:00
Technus
55fafa97a4 Remove direct ore smelting for most materials... still no one uses it :D 2016-11-07 17:22:06 +01:00
Technus
91e686ea30 Nerfing osmium and iridium 2016-11-07 16:46:56 +01:00
Technus
5c1c6d26b0 EBF nerf/fix, moved some recipes to coremod, the run() was too long..., i also made sure u have only the correct recipes ingame, just add 20000 to required EBF temperature and add your own recipes for EBF. 2016-11-07 16:10:54 +01:00
Technus
ca2bcdc3be Rework EBF recipes 2016-11-07 10:30:03 +01:00
Ugachaga
7e69841b56 Fix parsing oreNetherStar and oreBasalticMineralSand 2016-11-07 05:36:36 +07:00
Dream-Master
ab713c3265 more Ores Archivements 7 2016-11-05 16:14:37 +01:00
Dream-Master
870e4f07e7 more Ores Archivements 6 2016-11-05 15:45:35 +01:00
Dream-Master
d57d4fb3d9 more Ores Archivements 5 2016-11-05 15:41:22 +01:00
Dream-Master
04357cfa0f more Ores Archivements 4 2016-11-05 15:23:58 +01:00
Dream-Master
039e67e49f more Ores Archivements 3 2016-11-05 15:13:07 +01:00
Dream-Master
4fddc02db0 more Ores Archivements 2 2016-11-05 14:44:46 +01:00
Dream-Master
a0b7ceaa42 more Ores Archivements 2016-11-05 14:38:58 +01:00
Dream-Master
22d2fb1bcd Fixed Archivements. Add some new Test Archivemnts 2016-11-05 13:24:35 +01:00
Dream-Master
d46db5edaf Try to fix Void Metal. Thaumcraft variant should be taken be default. 2016-11-05 11:16:10 +01:00
Technus
4c19a7f330 optimize imports and make gt (block) pump auto output on top 2016-11-04 16:01:54 +01:00
Technus
dde2673ba9 Just to be sure 2016-11-04 13:45:54 +01:00
Technus
82544a5246 Optimize oil gen estimator (who gives a damn about rounding when it doesnt really affect the result that much >1%) 2016-11-04 13:44:32 +01:00
Technus
d72eef6662 I like my non zero values every where ;] 2016-11-04 13:35:03 +01:00
Technus
eac4226c16 Estimate optimized functions for bloodasp like oil amounts (uhh) 2016-11-04 13:26:08 +01:00
Blood-Asp
840f269088 Blood asp fixes for scanner and tc recipes for mercury 2016-11-04 10:25:02 +01:00
Technus
b6775d3601 Make some empty wells and nerf oildrill more 2016-11-04 10:20:10 +01:00
Technus
d55d3f16d4 That should be there 2016-11-03 14:57:55 +01:00
Technus
d3efbca904 Remove double hint on pyrolyze 2016-11-03 12:19:46 +01:00
Technus
e719b6ca17 Nerf field gens 2016-11-03 11:50:43 +01:00
Blood-Asp
92a03cc175 Fix broken crop oreprocessing 2016-11-02 23:59:09 +01:00
Blood-Asp
48b7a95224 Fix Large turbine tooltips 2016-11-02 23:58:13 +01:00
Blood-Asp
7396eb70c7 Stop machines 2016-11-02 23:50:38 +01:00
Technus
c410fce3de Fix diesel bug 2016-11-02 23:38:49 +01:00
Technus
687dce02a1 Might save a single cpu cycle... 2016-11-02 12:19:32 +01:00
Technus
1ea065d7df Ok this should work nice ahh... 2016-11-02 12:18:24 +01:00
Technus
298e1a6008 Why it didnt staged... 2016-11-02 11:24:05 +01:00
Technus
ce13329d92 Oil driller nerf, pressure like behaviour 2016-11-02 11:21:25 +01:00
Technus
6f97297d43 Pollute even more 2016-11-02 10:24:53 +01:00
Technus
c7b9f23f55 A better gui for oir rig 2016-11-01 21:47:12 +01:00
Technus
24346044a1 MOOOOORE POLLUTION 2016-11-01 20:45:28 +01:00
Technus
5668606784 Just to feel better about my self 2016-11-01 19:14:59 +01:00
Technus
f52851fe6e Rework oil gen 2016-11-01 19:14:28 +01:00
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
Technus
26613df780 Textures 2016-10-28 00:11:26 +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
5e80773208 slow down animations 2016-10-24 20:11:04 +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
5849d99645 Texture changes 2016-10-19 16:05:06 +02:00