Commit graph

1334 commits

Author SHA1 Message Date
David Vierra
086a590c53 Fix #830 - Maint Cover does not emit if rotor needs maint
Also change the condition back to 20% durability or less
2017-01-05 18:07:30 +01:00
Technus
6cfe809d4b Merge branch 'experimental' into eM
# Conflicts:
#	libs/GTNewHorizonsCoreMod-1.7.10-1.3.02.jar
2017-01-05 17:59:04 +01:00
Dream-Master
8dbbf23f48 Diesel get a new burn value
Light fuel is 256 heavy fuel 192
2017-01-04 08:56:46 +01:00
Dream-Master
64afb0f43b no message 2017-01-03 19:10:40 +01:00
Dream-Master
d28f4f5798 Change Distillation Tower to hv 2017-01-03 19:08:11 +01:00
Dream-Master
355f419f41 change 32 eu to 30 2017-01-03 06:52:51 +01:00
Dream-Master
8cbb366360 Concurrency error in GT_LanguageManager.addStringLocalization
fixed by @codewarrior0
2017-01-02 16:01:33 +01:00
Technus
c1da08e750 remove todo 2016-12-30 11:21:43 +01:00
Technus
49d2982094 remove todo 2016-12-30 11:21:06 +01:00
Technus
d6691d4cff fix coilage 2016-12-26 21:43:45 +01:00
Technus
cc8f219f9b fix coilage 2016-12-26 21:43:16 +01:00
Technus
2f51bf22c2 we dont have it 2016-12-26 15:48:42 +01:00
Technus
e5d9cd3ca1 we dont have it 2016-12-26 15:48:32 +01:00
Technus
6f52504283 Fix EBF coil buff 2016-12-26 15:45:10 +01:00
Blood-Asp
9e4d94724d Better furnacing with better coils. 2016-12-26 15:45:05 +01:00
Blood-Asp
ea782bba71 rocketfuel? 2016-12-26 15:45:00 +01:00
Blood-Asp
69d920c22b Plunger Sounds 2016-12-26 15:44:55 +01:00
Blood-Asp
b599c86958 Sense use cost 2016-12-26 15:44:51 +01:00
Blood-Asp
eabce17260 MAgic super fuel changes 2016-12-26 15:44:46 +01:00
Blood-Asp
c36e2578db Fix diesel engine info 2016-12-26 15:44:41 +01:00
Blood-Asp
e865990e11 Rise Hot coolant -> heat conversion ration in IC2 heat exchanger by 20% to avoid rounding bug 2016-12-26 15:44:36 +01:00
Blood-Asp
92c702a3a1 Fix Food Can recipes 2016-12-26 15:44:31 +01:00
Blood-Asp
d6fd3fd7fa Foid invalid steam in turbines 2016-12-26 15:44:25 +01:00
Technus
443806f73a Fix EBF coil buff 2016-12-26 15:44:00 +01:00
Blood-Asp
f361360e06 Better furnacing with better coils. 2016-12-26 15:32:41 +01:00
Blood-Asp
8bc9e659a6 rocketfuel? 2016-12-26 15:28:49 +01:00
Blood-Asp
3483fad95b Plunger Sounds 2016-12-26 15:25:48 +01:00
Blood-Asp
94c2d1fbfa Sense use cost 2016-12-26 15:25:09 +01:00
Blood-Asp
d08d3ce564 MAgic super fuel changes 2016-12-26 15:21:39 +01:00
Blood-Asp
7234f4b808 Fix diesel engine info 2016-12-26 15:16:58 +01:00
Blood-Asp
291bdd1529 Rise Hot coolant -> heat conversion ration in IC2 heat exchanger by 20% to avoid rounding bug 2016-12-26 15:15:43 +01:00
Blood-Asp
451b501424 Fix Food Can recipes 2016-12-26 15:15:36 +01:00
Blood-Asp
0ad315d000 Foid invalid steam in turbines 2016-12-26 15:14:31 +01:00
Blood-Asp
6465134c4c Fix type filter 2016-12-26 15:13:42 +01:00
Blood-Asp
3a8b8bc380 Fix type filter 2016-12-26 15:13:29 +01:00
Technus
f9593e403e Revert "becon base"
This reverts commit 5673532389.
2016-12-26 10:31:12 +01:00
Technus
5673532389 becon base 2016-12-26 10:23:43 +01:00
David Vierra
f10d77ef91 Don't allow Large Turbine to start up without Dynamo Hatch
Large Turbine was incomplete if the Dynamo Hatch spot was taken up by a different GTTE, but not if that spot was just Air or some other block.
2016-12-17 17:19:11 +01:00
David Vierra
1a4e134f16 Don't allow Large Turbine to start up without Dynamo Hatch
Large Turbine was incomplete if the Dynamo Hatch spot was taken up by a different GTTE, but not if that spot was just Air or some other block.
2016-12-17 16:36:07 +01:00
Technus
756a6b9f63 Change dyes again and make machines use the GT Dyes instead of Forge Dyes. (makes gui looks like rendered block) 2016-12-17 16:34:55 +01:00
Technus
6eed47cfaa kek 2016-12-17 14:21:06 +01:00
Technus
a9682acf92 Fix gem recipes this time for real. 2016-12-16 17:18:49 +01:00
Technus
e59c63ac64 revert cable fixes 2016-12-16 17:18:41 +01:00
Technus
8b2096ea78 Fix gem recipes this time for real. 2016-12-16 17:05:20 +01:00
Technus
49681ce847 revert cable fixes 2016-12-16 09:37:57 +01:00
Technus
3be8aef524 Fix on first tick just in case someone wasnt to tp to 0 0 0 0. 2016-12-15 19:08:18 +01:00
Technus
81ba247d78 Rework muffler add texture for eM overflow 2016-12-15 14:15:06 +01:00
David Vierra
3787b0399b Fix #785 - Unlimited EU in Dynamo Hatch
I went with @Techlone's simple solution after all.

Counting out the individual EU might make more sense if any of the multiblocks could have more than one dynamo hatch, but they don't, so this is just fine.
2016-12-12 17:09:02 +01:00
David Vierra
eb45538f03 Fix #785 - Unlimited EU in Dynamo Hatch
I went with @Techlone's simple solution after all.

Counting out the individual EU might make more sense if any of the multiblocks could have more than one dynamo hatch, but they don't, so this is just fine.
2016-12-12 17:05:35 +01:00
Technus
60a9a2c09e Not needed serverside, 2016-12-12 17:04:54 +01:00
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