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

694 commits

Author SHA1 Message Date
Maxime Legkiy
2d3310718a Add Dimension BlackList 
Add Other Dimension Oil Generating
Save Amount for Other Dimension
 2017-02-07 04:44:35 +03:00
Maxime Legkiy
00834b6c4b Add Underground Oil Spawn Dimensions 
Fix bug reduction oil around coordinates 0 0
Add value MaxAmount in GregTech.cfg
 2017-02-07 02:52:26 +03:00
Maxime Legkiy
d703850358 Add UndergroundOil Settings 2017-02-07 02:44:31 +03:00
Maxime Legkiy
379b6a8bd1 Fix generate oil around coordinates 0 0 2017-02-06 20:05:08 +03:00
Maxime Legkiy
811644f90a Fix bug > Oil Teleportation to GC Planets #837 2017-02-06 17:53:03 +03:00
Maxime Legkiy
2c82f057aa Fix respawn oil amount if amount down to 0 and reduction amount oil if use Seismic Prospector or more 2017-02-05 18:36:34 +03:00
Blood-Asp
f00ccaa279 fix turbine check in large turbines 2017-02-04 12:25:16 +01:00
Blood-Asp
9afffee2a6 Add checks to prevent crash on item inseration into generators 2017-02-03 22:46:39 +01:00
Blood-Asp
023609842c Fix charcoal pit accepting wood planks 2017-02-03 20:31:01 +01:00
Blood-Asp
b347471d03 Fix memory overflow with fluid stack on client side 2017-02-03 18:57:18 +01:00
Blood-Asp
d112ad06ae Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable 2017-02-03 18:37:29 +01:00
Blood-Asp
36bc0a6643 Fix osmiridium crafting recipe 2017-02-03 18:37:23 +01:00
Blood-Asp
632c918b8c Fix tungstencarbite recycling 2017-02-03 18:37:01 +01:00
DEMOOH
ba0a0ba4d4 Steam extractor and compressor fix 2017-02-02 14:02:51 +02:00
Muramasa-
37ca6746e3 Adjust process times/eut & steam machine NEI 2017-01-20 04:49:31 +00:00
Blood-Asp
65c5813ae3 Merge pull request #858 from Techlone/unstable 
Disable miner when mining pipes is over
 2017-01-19 12:38:50 +01:00
Blood-Asp
1cf283afa8 Merge pull request #857 from vlad20012/fix-816 
Fix #816 obfuscated field name
 2017-01-19 12:38:37 +01:00
Blood-Asp
e95e832aba Merge pull request #856 from vlad20012/fix-851 
Fix #851
 2017-01-19 12:38:04 +01:00
John
90442a8d91 check that miner can't move down 2017-01-14 04:11:13 +05:00
Muramasa-
5c5aad4522 Adds IC2 machine recipes to GT machines, needs testing 2017-01-13 21:35:18 +00:00
vlad20012
5af9a6718c Fix #816 obfuscated field name 2017-01-10 11:34:46 +03:00
vlad20012
095275bb36 Fix #851 2017-01-10 11:20:35 +03:00
KpoxaPy
d64c5b2106 Update large turbines output tooltip Blood-Asp/GT5-Unofficial#829 issue 2017-01-05 15:04:15 +03:00
KpoxaPy
4aa8fd45c4 Add advanced seismic prospector 2017-01-05 02:45:01 +03:00
Blood-Asp
b794aac1d0 Merge pull request #827 from KpoxaPy/unstable 
Fix #825
 2017-01-04 16:42:25 +01:00
Blood-Asp
868fe1f77d Merge pull request #833 from codewarrior0/patch-1 
Fix #830 - Maint Cover does not emit if rotor needs maint
 2017-01-04 16:36:04 +01:00
Andrew Ozmitel
e7e48ff215 Merge remote-tracking branch 'upstream/unstable' into unstable 2017-01-04 15:16:31 +03:00
David Vierra
50b9fc9238 Fix #720 - Concurrency error in GT_LanguageManager.addStringLocalization 2017-01-01 21:57:31 -10:00
Muramasa-
7a8067868d Add missing NEI GUIs & IC2 machine recipe config 2016-12-31 10:17:55 +00:00
David Vierra
75acc1d3eb Fix #830 - Maint Cover does not emit if rotor needs maint 
Also change the condition back to 20% durability or less
 2016-12-30 23:57:40 -10:00
Andrew Ozmitel
674a2aec83 Fix Blood-Asp/GT5-Unofficial#825 2016-12-28 20:03:05 +03:00
Muramasa-
c69a768640 Fix missing Computronics components 2016-12-27 22:42:02 +00:00
Muramasa-
7e3d4ccf4a Port LightningRod (To be changed by Bloody) & Character fix 2016-12-27 21:08:16 +00:00
Muramasa-
58e2886012 Fix ToolHead processors 2016-12-27 20:49:28 +00:00
Blood-Asp
94cdcfe33c Fix fluid naquadah generator not consuming fuel 2016-12-27 12:14:40 +01:00
Blood-Asp
0c56122e35 Fix Chlorine recipes 2016-12-27 10:41:49 +01:00
Blood-Asp
08c9e3986c Fix pollution effect coordinate calculation 2016-12-24 15:57:34 +01:00
Blood-Asp
e1c60d8bad EBF Efficiency improvements with hier tier coils 
Every 1800K free heating capacity the EBF can be overclocked one tier
without efficency loss(4xEU/t, 1/4process time).
Every 900K free heating capacity EU/t is lowered by 5%.
 2016-12-24 11:18:14 +01:00
Blood-Asp
2d35f8c0bc Adding missing GT++ metaitems 2016-12-24 00:44:13 +01:00
Blood-Asp
4e1c4b241d Fix broken Hydric Sulfide recipe 2016-12-24 00:41:24 +01:00
Blood-Asp
f2729f281b Rebalanced Rocket Fuel production cost 2016-12-24 00:15:31 +01:00
Blood-Asp
a13374f6ca Correct Chlorine and Hydric Sulfide fluid states 2016-12-24 00:02:16 +01:00
Blood-Asp
823a1fccd2 Play plunger sound when clearing fluids from GT machines 2016-12-23 23:51:47 +01:00
Blood-Asp
c250d93fe5 Reduce damage sense takes when harvesting ic2 crops compared to other uses 2016-12-23 23:51:02 +01:00
Blood-Asp
8e8843b3c9 Enable heat bonus for Naquadah fuel rods 2016-12-23 18:39:42 +01:00
Blood-Asp
60328e2adf Fix oil only be found on second scan 2016-12-23 18:01:36 +01:00
Blood-Asp
77b25d8c82 Add new usages for Graphite 2016-12-23 17:57:58 +01:00
Blood-Asp
82b97af85e Naquadah gen mk3 now uses cells with molten naquadah instead of dust 2016-12-23 14:27:42 +01:00
Blood-Asp
ba8b780c9e Magic super fuel recipes that do not need thaumcraft 2016-12-23 13:55:00 +01:00
Blood-Asp
46c145c06b Fix efficiency in scan data of Diesel Engine 2016-12-19 14:27:29 +01:00
Blood-Asp
6e3e6494a1 Merge pull request #803 from dgabehar/unstable 
Crash with Modular Exoskeleton #769
 2016-12-17 18:21:51 +01:00
Blood-Asp
c9eb3dc3b4 Rise Hot coolant -> heat conversion ration in IC2 heat exchanger by 20% to avoid rounding bug 2016-12-17 18:20:59 +01:00
Blood-Asp
f3f90f699b Fix Food Can recipes 2016-12-17 18:16:37 +01:00
Blood-Asp
1aa9ce6501 Fix LuV+ disassemblers 2016-12-17 18:10:38 +01:00
Blood-Asp
f0ff2a6cfc Void wrong type of steam inserted into steam turbines. 
Prevents getting stuck on superheated/normal steam change.
 2016-12-16 18:34:26 +01:00
Blood-Asp
cca28f29fa Add mable and basalt ores to ore typefilter 2016-12-16 17:54:43 +01:00
Blood-Asp
650ec1a800 Fix ULV and LV wire/cable recipes 2016-12-16 17:23:39 +01:00
Doug Gabehart
3d2dd065fa Added check to ensure that fluid is set trying to provide air to player during onArmorTick 
Looking at how to fill helmet tank from air cell
 2016-12-15 17:11:13 -06:00
Doug Gabehart
b41c3370cc Fixed processing power issue where values continually increased up to infinity 2016-12-15 09:10:45 -06:00
Doug Gabehart
6364378437 More stability improvements. (Null value and checks to ensure keys exist) 2016-12-14 20:35:43 -06:00
Doug Gabehart
6ceff6d783 Fixed issue with Modular Armor inventory not saving properly after removing the call to closeScreen 
Added null and key checks when determining if a full radiation or electrical armor set is configured
 2016-12-14 16:04:20 -06:00
David Vierra
7d1e42f75c 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-14 20:06:31 +01:00
Doug Gabehart
b9ebe16655 Removed player.closeScreen call to fix graphics glitch when switching armor tabs 2016-12-14 11:34:00 -06:00
Doug Gabehart
df00993c0d Added updateArmorStats method which includes additional checks to ensure that values are not null and the key in question exists in mStats 
Removed player.closeScreen call in mouseClicked to prevent display glitch when switching armor gui tabs; (mouse focus from returning to 2x2 crafting grid)
 2016-12-14 11:12:07 -06:00
Dimach
d51f43f97b Ore harvest level rework. Fixed #730. 2016-12-13 20:20:36 +01:00
Blood-Asp
1efd486dbb Disable markDirty function of TileEntitys 
http://forum.industrial-craft.net/index.php?page=Thread&postID=205162#post205162
 2016-12-13 20:10:30 +01:00
Blood-Asp
f86fce4cf3 Fix mining laser recipe 2016-12-13 20:08:23 +01:00
David Vierra
3b5dfb6f7b 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-13 19:24:31 +01:00
Blood-Asp
8e31958980 Merge pull request #777 from Dimach/unstable 
Fixed #767
 2016-12-13 19:17:47 +01:00
Blood-Asp
423b3ad8ef Merge pull request #798 from Techlone/unstable 
Fix optimal plasma flow tooltip
 2016-12-13 19:16:21 +01:00
David Vierra
0cd2371e3b 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-13 19:15:08 +01:00
David Vierra
dcf348a7e1 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-13 19:15:08 +01:00
David Vierra
f98ce7ef08 Fix #771 - 9x output on boosted Diesel 
Remove an extra efficiency multiplier. `mEfficiency * mEUt` is already done in `GT_MetaTileEntity_MultiBlockBase.onRunningTick`
 2016-12-13 19:15:07 +01:00
David Vierra
d699de59ba Adjust Diesel Engine tooltip to match requirements 
16 Casings are required along the corners and edges. The Hatches may not be along a corner or edge, but may only be placed on the sides, next to a Gear Box.

Also note Diesel, Lube, and Oxygen use.
 2016-12-13 19:15:07 +01:00
David Vierra
d519d7f00b Replace all literal numbers referring to tool types with named constants 2016-12-13 19:15:07 +01:00
Данила Большаков
8ea9df2e7b Hide bar 2016-12-13 13:53:37 +03:00
Danila Bolshakov
60704cca7f forgot check null 2016-12-13 11:50:01 +03:00
Danila Bolshakov
920ba2f0c3 Add progress bar 2016-12-13 11:41:38 +03:00
Techlone
75fc96694a fix optimal plasma flow tooltip 2016-12-12 22:59:04 +05:00
Archengius
248b88e8bc Merge pull request #797 from Dimach/fluidregulator-fix 
Fixed #796.
 2016-12-12 01:22:59 +07:00
Dimach
be37504009 Fixed #796. 2016-12-11 19:56:06 +02:00
Blood-Asp
34481d0c85 Merge pull request #788 from Dimach/unstable-upstream 
Fixed #786.
 2016-12-07 22:07:49 +01:00
Dimach
151fc26133 Fixed #786. 2016-12-07 11:48:33 +02:00
David Vierra
4176f2c525 Fix Advanced Miner II occasionally outputting the wrong blocks 
AdvMinerII would occasionally output the drops from a block recently
broken by the player. This happens when the wrong coordinates are
passed to GT_Block_Ores_Abstract.getDrops(), which causes it to fail to
find the TileEntity and then fall back to whatever the most recently
broken block was.

Fixes #751 (probably), #674, #508
 2016-12-04 15:22:03 -10:00
Dimach
b1c2cbe935 Fixed #767. 2016-11-28 22:05:42 +02:00
Timeslice42
7df5add5a9 Re-add single-use batteries 
How did this get removed? ><
 2016-11-05 22:11:36 +01:00
Blood-Asp
58206f909e Merge pull request #727 from Dimach/unstable 
Fixed oil rig
 2016-11-04 22:13:45 +01:00
Dimach
bc619efb8a Fixed oil rig. 2016-11-04 21:30:57 +02:00
Blood-Asp
2108b9cdc8 Assemblyline recipe scan fix and TC quicksilver/mercury recipes 2016-11-04 00:05:15 +01:00
Blood-Asp
c552f67120 Fix Large turbine tooltips 2016-11-02 23:16:23 +01:00
Blood-Asp
8a17c67442 Turn off AdvMinerII and OilDrill once work is done. 2016-11-02 23:14:40 +01:00
Blood-Asp
481580b723 Fix broken crop oreprocessing 2016-11-02 22:55:13 +01:00
Blood-Asp
395888a884 Modular Armor configs 2016-11-02 22:14:18 +01:00
Blood-Asp
bacc30c248 Merge pull request #716 from danbka33/patch-1 
Fix maintenance does not change the machine color
 2016-11-02 18:24:36 +01:00
Blood-Asp
a60428ab53 Fix ignored oredict names list not working 2016-11-01 13:18:44 +01:00
Danila Bolshakov
7c1d44d835 Maintenance does not change the machine color 2016-11-01 02:10:56 +03:00
Blood-Asp
cef2d02416 Merge pull request #713 from Technus/patch-1 
Fix for Scanner
 2016-10-30 22:41:17 +01:00
Blood-Asp
814dc25690 Modular Armor changes 1 2016-10-30 22:39:40 +01:00
Daniel
b3ed735ef2 Fix for Scanner 
being derp when looking @ pollution
 2016-10-30 11:09:24 +01:00
Blood-Asp
ed724da44d Auto Maintainance fix 2016-10-27 22:24:41 +02:00