Commit graph

334 commits

Author SHA1 Message Date
Blood-Asp
8e043d00d9 Cables and pipes now change hitboxes dynamicly depending on connections or covers 2017-06-12 11:58:26 +02:00
Blood-Asp
9032c2e15b Quick fixes 2017-06-07 09:45:19 +02:00
Blood-Asp
1296755b27 Merge branch 'refs/heads/pr/1077' into unstable
# Conflicts:
#	src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java
2017-06-07 09:37:13 +02:00
Blood-Asp
3b1f55fcb9 Merge pull request #1076 from vlad20012/int-overflow-fix
Fixed stored energy integer overflow
2017-06-07 09:30:04 +02:00
Blood-Asp
589a77c5cb Check general redstoneoutput for null 2017-06-06 16:19:45 +02:00
Blood-Asp
c1f85264a0 Add missing translation lines. #772 2017-06-05 20:45:15 +02:00
Technus
71aeac25b9 Missing in item pipe 2017-06-05 15:03:34 +02:00
Blood-Asp
e102488f2c More redstone changes 2017-06-04 19:11:03 +02:00
Technus
c9908ffa98 wire/pipe hiding/reduced size 2017-06-04 09:28:43 +02:00
Technus
0db3a1d6df Missing override 2017-06-04 09:25:46 +02:00
vlad20012
64a69695e5 Fixed stored energy integer overflow 2017-06-04 05:32:47 +03:00
Blood-Asp
23de1f09ed Cleanroom controller outputs efficency as redstone signal #948 2017-06-04 00:26:31 +02:00
Technus
467e6ba022 1ddc91a 2017-06-03 16:11:59 +02:00
Technus
a4f0426159 8e0e516 2017-06-01 13:22:10 +02:00
Technus
a99e0d4ffb Not needed. 2017-06-01 13:19:27 +02:00
Technus
82458fed2e Cherry-Pick c12e474
c12e474c23
2017-06-01 13:18:34 +02:00
Blood-Asp
94f8581477 Fix multiblock recipe search fix #1044 2017-05-31 21:52:58 +02:00
Blood-Asp
b047ab56b2 Fix spelling #1043 2017-05-31 21:42:32 +02:00
Blood-Asp
3f73fa9b86 Merge pull request #1058 from Georggi/patch-4
Auto Maintenance Hatch tweaks
2017-05-31 18:57:39 +02:00
Blood-Asp
ba030d3239 Merge pull request #1060 from JohannesGaessler/MaterialFormulaFix
Material formula fix
2017-05-31 18:57:05 +02:00
Blood-Asp
c28a8ceb78 Catch broken items on recipe move 2017-05-31 18:10:11 +02:00
Johannes Gäßler
32db407391 Removed debugging prints accidentally left in the previous commit 2017-05-18 19:27:53 +02:00
Johannes Gäßler
d805ce4613 Fixed MaterialStack String representations sometimes missing brackets 2017-05-18 19:22:06 +02:00
Yuriy Shnitkovskiy
bc7eaaa762 Added config for automation 2017-05-16 19:49:46 +03:00
Yura
4e3ed071dc Auto Maintenance Hatch tweaks
Fixed #958 and #1053, allowed robots\pipes to interact with it.
2017-05-16 16:17:01 +03:00
Johannes Gäßler
0aeab34a56 Fixed the Electric Blast Furnace not recognizing recipes when there is
more than one Fluid input.

Also added a String representation for GT_FluidStack that was used for
debugging.
2017-05-06 18:01:06 +02:00
Techlone
cff6b44a84 Formatting clean up, nothing else 2017-04-27 16:32:27 +05:00
Johannes Gäßler
eb45688648 Fixed a bug where excess fuel didn't consider the distortion from
runtimeBoost.

Adjusted the decimal points of the Large Boiler fuel tab to better
represent the actual burn times.
2017-04-27 00:28:07 +02:00
Johannes Gäßler
baa9caf06b Eliminated rounding errors that caused fuel to burn too shortly
The Large Boiler now saves excess fuel between items, greatly improves
performance of items like sticks and planks.
The Large boiler now stores excess projected EU that is lost when
throttling with an integrated circuit
2017-04-26 23:57:10 +02:00
Johannes Gäßler
8f4225f0b8 Refactored mDescription to mDescriptionArray, added a deprecated field
mDescription to ensure 100% backwards compatibility
2017-04-26 20:37:47 +02:00
Johannes Gäßler
878738a75c Corrected the Maintenance Hatch tooltip 2017-04-24 23:55:42 +02:00
Johannes Gäßler
1c75968fad Fixed the GTLog spam, ty Techlone 2017-04-24 23:40:24 +02:00
Johannes Gäßler
c2c9fad120 Fixed a bug that caused Battery Buffers to not have a tooltip 2017-04-24 20:50:08 +02:00
Johannes Gäßler
d79721085e Tooltips have more info on Steam and pollution, adjusted pollution rates
Boilers tooltips now explicitly state the amount of Steam produced per
second.
Gas Turbine tooltips now explicitly state how much steam is needed for
them to run at full capacity.

Machine tooltips now explicitly state how much Pollution they produce
per second.
Adjusted machine pollution values to have them align better.
Diesel Generators / Engines now go 40, 80, 160, 320
Gas Turbines now go 20, 40, 80, 160

Large Boiler tooltips now mention the amount of time needed to heat up

Formatted the source code for the Cleanroom

Fixed a bug that caused Diesel Generators and Gas Turbines to not have a
tooltip.
2017-04-15 19:05:57 +02:00
Johannes Gäßler
234c51ac20 Machine descriptions are now a String array instead of a single String.
The field mDescription of the class GT_MetaTileEntity_TieredMachineBlock
was turned into an array.
Every class derived from GT_MetaTileEntity_TieredMachineBlock has
received a new additional constructor that takes an array of Strings
instead of a single one.
2017-04-14 23:33:20 +02:00
Johannes Gäßler
2064e0b12c Explicitly added some Solid Fuels to the Large Boiler Fuel tab.
I was unable to automatically add all fuels to the tab.
2017-04-11 00:47:56 +02:00
Johannes Gäßler
822cf1ec3e Expanded the NEI api to allow for custom descriptions, added liquid
fuels to the newly created Large Boiler tab

Instead of the default information like total EU or EU usage it is now
possible to provide custom Strings to describe a recipe.

The Large Boiler NEI tab explicitly shows burn times for fuels depending
on the boiler used.
Any liquid fuel added to Diesel Fuels or Semifluid Fuels will
automatically be added to Large Boiler Fuels.
2017-04-10 20:57:44 +02:00
Blood-Asp
ee5af6ac40 Fixing names for plastics 2017-04-10 13:07:13 +02:00
Blood-Asp
d41d3cd2b3 Add assemblyrecipes for all circuits per oredict 2017-03-31 22:24:15 +02:00
Blood-Asp
f030951982 Config for blocks below crops 2017-03-31 21:19:04 +02:00
Blood-Asp
32a21a0ac1 Remove testline 2017-03-31 19:02:45 +02:00
Blood-Asp
dd8510792f Detect low grav dimensions by world provider 2017-03-31 19:01:32 +02:00
Blood-Asp
944f1dab7e Missed a file 2017-03-31 17:38:48 +02:00
Blood-Asp
4fc431e77e Add Lightning Rod 2017-03-31 17:38:29 +02:00
Blood-Asp
445e548b4c Allow teleportation to galacticraft dimensions 2017-03-23 21:16:32 +01:00
Blood-Asp
5f56c40a75 Prevent empty batterys from stacking in battery buffer 2017-03-23 13:59:16 +01:00
Blood-Asp
de18b83e85 TryCatch broken IC2 recipes 2017-03-23 13:59:16 +01:00
MauveCloud
b9d4d15a0c Fix for negative-coordinate vein generation, adjustments to recipes for stone dust, sand, and flint 2017-03-16 16:24:39 +02:00
Blood-Asp
f4dae834da Merge pull request #952 from Techlone/soldering_alloy
Config for using only soldering alloy
2017-03-16 14:56:45 +01:00
Techlone
288f44e347 Added a sorting of recipes in NEI 2017-03-16 00:24:41 +05:00