Commit graph

1479 commits

Author SHA1 Message Date
Antifluxfield
51334d19db Draw the cross in the hint grid 2017-11-09 15:50:03 +08:00
Pranav
1245f31d27 Fix Material Index 2017-11-08 08:03:14 -05:00
Antifluxfield
ced4854069 Try to fix the unexpected disconnection caused by those unloaded chunks 2017-11-08 16:09:32 +08:00
Pranav
c74b3dc365 Change Gasoline production a little bit 2017-11-06 22:14:22 -05:00
SuperCoder79
d30dfe7b3e
Add ethyl tert-butyl ether and rename gasolines 2017-11-06 21:05:48 -05:00
SuperCoder79
5b13b53c3a
Fix typo 2017-11-06 12:25:38 -05:00
SuperCoder79
af2278736e
Fix missing cell 2017-11-06 08:59:21 -05:00
SuperCoder79
f17a3efb6b
Remove useless import 2017-11-06 08:52:18 -05:00
Antifluxfield
e18f0a186d Fix cover placing issue with such small AABB of metapipes 2017-11-06 17:53:15 +08:00
SuperCoder79
83bd3a0120
Replace lead with toluene 2017-11-05 18:59:05 -05:00
Pranav
6bc98744ec Add Gasoline 2017-11-05 17:18:31 -05:00
SuperCoder79
8c80a050ca
Fix small bug with block position 2017-11-05 12:44:51 -05:00
Blood-Asp
d83d52647a
Merge pull request #1271 from SuperCoder7979/Plantball-fix
Plantball fix
2017-11-05 18:12:06 +01:00
Blood-Asp
ce4d0b705d
Merge pull request #1269 from MauveCloud/unstable
Removed oredict registration of AnyIron, AnyCopper, etc.
2017-11-05 18:11:12 +01:00
Blood-Asp
2a466bb76e
Merge pull request #1267 from redmage17/unstable
Configed Storage Blocks
2017-11-05 18:07:53 +01:00
Blood-Asp
53993d67ac
Merge pull request #1261 from SuperCoder7979/unstable
Fix free tin bug by making Dimethyldichlorosilane and fix methane not outputting enough cells
2017-11-05 18:01:29 +01:00
Blood-Asp
c7851042b9
Merge pull request #1254 from Antifluxfield/overflow_fix
Fix overflow when charging ultimate battery
2017-11-05 18:00:30 +01:00
Blood-Asp
e9313b5198
Merge pull request #1251 from Antifluxfield/l10n_improve
Localization improve
2017-11-05 17:58:33 +01:00
Blood-Asp
07a0e94eec
Merge pull request #1249 from Antifluxfield/recipe_loading_fix
Fix unexpected recipe loading
2017-11-05 17:55:48 +01:00
Blood-Asp
d267fc8b8d
Merge pull request #1240 from Sirse/unstable
Added TeleporterUsingEvent.
2017-11-05 17:45:44 +01:00
Blood-Asp
471376dc70
Merge pull request #1232 from Dimach/unstable-1
Fixed small bug - basic miner cant work using battery in inner slot.
2017-11-05 17:40:05 +01:00
Blood-Asp
7982163281
Merge pull request #1230 from Antifluxfield/driller_fix
Drillers fix
2017-11-05 17:39:21 +01:00
Blood-Asp
083b6b0b2c
Merge pull request #1228 from DEMOOH/unstable
Glass fiber recipe fix
2017-11-05 17:04:57 +01:00
Blood-Asp
de7195ffc2
Merge pull request #1226 from Antifluxfield/patch-1
Fix AssLine structure check
2017-11-05 17:02:07 +01:00
Blood-Asp
3c78346bcf prevent circuit conversation/tier jump 2017-11-05 16:56:45 +01:00
Alkalus
c4b245af9b Added a failsafe for invalid Modular armour components. 2017-11-05 19:12:48 +10:00
SuperCoder79
5bfe5a55c8
Clean up code 2017-11-04 11:32:42 -04:00
SuperCoder79
a86dde4040
change compressedPlantball to plantball 2017-11-03 22:31:56 -04:00
Pranav
682069aa3b Fix the magic energy absorber 2017-11-03 22:06:43 -04:00
Pranav
5067a6fe4f Fix Saplings to Plantball 2017-11-03 22:03:20 -04:00
Pranav
09cdfd27ba Revert "Fix free tin"
This reverts commit aafc8c10de.
2017-11-03 21:42:56 -04:00
Antifluxfield
0f9be5a4c9
Merge pull request #1 from Dimach/driller_fix
Fixed bug - miners digs bedrock.
2017-11-03 12:33:04 -05:00
MauveCloud
7a27c859a8 Removed oredict registration of AnyIron, AnyCopper, etc. 2017-11-02 12:46:10 -07:00
Dimach
540ddb3e09 Fixed bug - miners digs bedrock. 2017-11-02 17:27:30 +02:00
redmage17
45a2057b69 Configed Storage Blocks
Added config for removal of shapless recipes for storage blocks
2017-11-01 10:43:34 -04:00
Antifluxfield
f6a9bbb293 Add the missing condition... 2017-11-01 17:10:37 +08:00
Antifluxfield
c648ac6ef0 Visualize fluid pipe input restriction 2017-10-31 01:39:13 +08:00
Antifluxfield
78aa11bd38 Another config to control wire connections, and disable them by default. 2017-10-30 19:17:00 +08:00
Antifluxfield
1e8189e5f9 Add all the Multi-pipes 2017-10-30 16:34:12 +08:00
Antifluxfield
77c639c8fb Fix ItemPipe tick time customization 2017-10-30 16:24:09 +08:00
Antifluxfield
7b0dc97594 Add Quadruple and Nonuple fluid pipes; fix several issues 2017-10-30 16:16:16 +08:00
Antifluxfield
f96993bd33 Soldering Tools for cable connection 2017-10-30 10:03:28 +08:00
Antifluxfield
22c2f16509 GT6 styled pipe and wire connection 2017-10-30 09:18:40 +08:00
SuperCoder79
5300d49dfb fix chloroform 2017-10-25 10:59:54 -04:00
SuperCoder79
69fa5a3698 fix free tin 2017-10-25 08:56:26 -04:00
SuperCoder79
aafc8c10de Fix free tin 2017-10-25 08:48:27 -04:00
Antifluxfield
b3e0abed70 Fix overflow when charging ultimate battery 2017-10-21 00:02:40 +08:00
Antifluxfield
ecacfddd69 l10n improve 2 2017-10-19 16:47:28 +08:00
Antifluxfield
32cea58782 l10n improve 2017-10-19 10:30:37 +08:00
Antifluxfield
15c86d4ea2 Fix 2017-10-18 17:53:59 +08:00
Antifluxfield
4e9e3db5ca Fix unexpected recipe loading 2017-10-16 14:21:18 +08:00
Alkalus
2d8df8d145 Actually fix the plunger behaviour this time. 2017-10-08 20:06:21 +10:00
Alkalus
f70c7d4046 Added documentation to updateTexture in GT_MetaTileEntity_Hatch.
Added a function to GT_Utility called addTexturePage(byte page).
Added information about who is using which texture page in GT_Block_Casings1.
Updated GT_Block_Casings5 & GT_Block_Casings8 to utilise texture page 1.
Updated Large Chemical Reactor to reflect this change, now also uses Page 1 Index 48.
Moved the Pyrolyse oven casing index from 111 to 22, which is currently unused and within the Gregtech index space.
2017-10-08 19:55:35 +10:00
Alkalus
85044d37a3 Small fix to Plunger behaviour. 2017-10-08 17:21:26 +10:00
Alkalus
c4dc585727 Made Cobble and Furnaces give sand again when macerated. 2017-10-08 17:15:55 +10:00
Antifluxfield
f5abfcefe8 The right method to find out whether the machine should break the block. 2017-10-08 02:48:49 +08:00
Sirse
7f68c17736 Added TeleporterUsingEvent.
In multiplayer players can teleport to "restricted" areas (like closed dimensions or WorldEdit regions), need to handle it.
2017-10-06 01:43:50 +07:00
Antifluxfield
4372034ff4 Rebalance EU cost 2 2017-10-02 11:31:01 +08:00
Johannes Gäßler
221f98bbcd Fixed RawStyreneButadieneRubber recipe cell amount 2017-09-26 13:59:58 +02:00
Dimach
32d4998ec6 Fixed small bug - basic miner cant work using battery in inner slot. 2017-09-25 14:01:46 +03:00
Antifluxfield
ef41455fe5 Fix wrong coordinate 2017-09-24 11:45:15 +08:00
Antifluxfield
3f0224f55f Register Reinforced Glass as GT machine casing 2017-09-23 17:14:15 +08:00
Antifluxfield
aef60bbf3b Fix wrong logic. 2017-09-22 14:06:42 +08:00
Antifluxfield
3db38a5c53 Update 2017-09-22 01:36:28 +08:00
Antifluxfield
e725c455b3 Adding Fake Player for all drills and pumps 2017-09-22 01:34:10 +08:00
Usenkov Dmitry
7b6bbb6a7c Glass fiber recipy fix
Prevent extruder from consuming wire mold
2017-09-21 18:24:43 +03:00
Antifluxfield
9d8ac82535 Fix Ore Drill EU calculation; now Ore Drill is using DrillerBase 2017-09-21 20:34:38 +08:00
Antifluxfield
0802fdbd02 Fix Oil Drill logic; rebalance EU cost 2017-09-21 20:33:23 +08:00
Antifluxfield
c40f01930e Fix #562
Listen to the BlockEvent of Reinforced Glass and trigger the update check.
2017-09-20 00:29:49 +08:00
Blood-Asp
73662e531f Merge pull request #1218 from GTNewHorizons/updateUO
Revert acciential change to UO
2017-09-14 22:56:18 +02:00
Technus
113a4506e3 Revert acciential change to UO 2017-09-14 22:44:47 +02:00
Antifluxfield
e8d172a66c Fix & Improve i18n 2017-09-15 01:29:06 +08:00
Antifluxfield
f5f8cceede Improve i18n 2017-09-15 01:28:31 +08:00
Antifluxfield
b1b8d7e782 Improve i18n 2017-09-15 01:27:32 +08:00
Antifluxfield
8faba6a054 Improve i18n of tooltip 2017-09-15 01:25:50 +08:00
Blood-Asp
673aaeaaab Merge pull request #1216 from Antifluxfield/patch-2
Fix l10n of Buffers
2017-09-14 19:02:51 +02:00
Antifluxfield
290b1fed03 Update GT_MetaTileEntity_Buffer.java
Fix Interaction_DESCRIPTION_Index_099
2017-09-14 15:16:10 +08:00
Antifluxfield
ad544bf68a Update PartP2PGTPower.java 2017-09-14 13:40:11 +08:00
Antifluxfield
bab8eb645d Fix #1213 2017-09-14 13:31:52 +08:00
Blood-Asp
5e38000ccc Add config for AE2Tunnel. Defaul off for now until fix. 2017-09-13 22:50:46 +02:00
Technus
af5b360508 more descriptive argument name 2017-09-13 21:35:44 +02:00
Technus
d111a4f130 Optimize a bit 2017-09-13 21:34:06 +02:00
Technus
339494f8c3 cherrypick 2017-09-13 21:33:41 +02:00
Technus
264236f98f Minor change, can catch potential errors when the extraction val per tick is insane 2017-09-13 21:27:52 +02:00
Blood-Asp
4c82462138 Fix #1212 2017-09-13 01:12:50 +02:00
Blood-Asp
ed2a421568 tooltip again 2017-09-13 01:11:45 +02:00
Blood-Asp
75991a36cd Fix oil drill crafting recipes 2017-09-13 01:10:47 +02:00
Blood-Asp
51a4389f7c Hard remove ores that might be exploitable by MRF laser drill 2017-09-12 22:53:02 +02:00
Blood-Asp
34ee89fc4b Fix Tooltip 2017-09-12 22:48:41 +02:00
Blood-Asp
c2fa20a2ce Rebalance Nitric Acid production cost vs usage 2017-09-12 21:59:53 +02:00
Blood-Asp
36eecf6196 Rebalance charcoal byproduct destillation 2017-09-12 21:55:40 +02:00
Blood-Asp
3f74245a5b Fix #1208 2017-09-12 21:52:31 +02:00
Blood-Asp
d61f8ed6f1 Fix #1201 2017-09-12 21:33:06 +02:00
Blood-Asp
419ce5496a Fix #1204 2017-09-12 21:26:52 +02:00
Blood-Asp
b78a31edb4 Merge fix 2017-09-12 21:26:36 +02:00
Blood-Asp
58a8eb5b6b Merge pull request #1211 from Antifluxfield/patch-2
Fix localization of Item Distributor
2017-09-12 21:20:58 +02:00
Blood-Asp
9ece29b94e Merge branch 'unstable' into odp_speed_improving 2017-09-12 21:20:13 +02:00
Blood-Asp
88364a5ba1 Merge pull request #1203 from YoungGT/unstable
Update zh_CN.lang
2017-09-12 21:10:14 +02:00
Blood-Asp
7a4795f7af Merge pull request #1200 from Dimach/unstable-11
Patched ME energy tunnel, now they can emit GT energy.
2017-09-12 21:09:50 +02:00
Blood-Asp
73c197ff25 Merge branch 'unstable' into drillers-upgrade 2017-09-12 21:04:33 +02:00
Antifluxfield
69d557908f Fix l10n of Item Distributor 2017-09-11 11:23:53 +08:00
Antifluxfield
bd305c45b0 Fix l10n of Item Distributor 2017-09-11 11:22:10 +08:00
Antifluxfield
bab71c5349 Fix NPE of fluid check 2017-09-11 10:49:47 +08:00
Antifluxfield
61d0582012 Fix NPE of fluid check. 2017-09-11 10:48:18 +08:00
John
2127e4950d missclick 2017-09-10 21:45:32 +05:00
Techlone
dae15665cc Now ODP Mk(N) is faster than Mk(N-1) 2017-09-10 21:41:33 +05:00
YoungGT
c0ca3865b0 Update zh_CN.lang 2017-09-10 20:50:26 +08:00
YoungGT
a6fe06c7f5 Update zh_CN.lang 2017-09-10 20:46:02 +08:00
YoungGT
6eb089d42b Update zh_CN.lang 2017-09-10 20:41:46 +08:00
Dimach
c6d39f12fd Replaced protected fields access with methods calls, now code more safe. 2017-09-06 10:47:03 +03:00
YoungGT
2eac4d9fa2 Update zh_CN.lang 2017-09-05 06:47:13 +08:00
YoungGT
9c9d915d51 Update zh_CN.lang 2017-09-04 22:19:42 +08:00
Antifluxfield
9cbb9c66a2 Fix logic when working in void dimensions 2017-09-04 00:09:13 +08:00
Blood-Asp
6df7f36bd9 Merge branch 'unstable' into CircuitChemistryUpdateFollowup 2017-09-03 17:57:34 +02:00
Blood-Asp
a6a7484138 Fix #1167 2017-09-03 17:10:27 +02:00
Blood-Asp
d0e3e9d68d Fix #1194 2017-09-03 16:09:25 +02:00
Blood-Asp
ec1460d2da Merge pull request #1184 from GTNewHorizons/texture_overhaul
Texture overhaul
2017-09-03 15:54:24 +02:00
Blood-Asp
a377bcea63 Merge pull request #1170 from JohannesGaessler/PyrometallurgyUpdate
Pyrometallurgy update
2017-09-03 15:46:19 +02:00
Blood-Asp
edba8167b6 Merge branch 'unstable' into patch-5 2017-09-03 14:55:30 +02:00
Blood-Asp
4f73a6b726 Merge pull request #1197 from JohannesGaessler/FluidCannerCostReduction
Fluid Canner cost reduction
2017-09-03 14:50:26 +02:00
Blood-Asp
30daf05176 Merge pull request #1195 from Techlone/fix_inconsistent_wordgen
Fix inconsistent worldgen
2017-09-03 14:49:29 +02:00
Blood-Asp
471ed5c9ea Merge pull request #1193 from Antifluxfield/patch-4
Improve fluid regulator
2017-09-03 14:45:38 +02:00
Blood-Asp
21bb9c8c8d Merge pull request #1192 from Antifluxfield/patch-3
Fix the Generated Item Pipes
2017-09-03 14:44:40 +02:00
Blood-Asp
0819ea5da7 Merge pull request #1191 from Antifluxfield/patch-2
Fix the Tooltip of Pumps
2017-09-03 14:44:01 +02:00
Blood-Asp
dc2a6073f0 Merge pull request #1174 from Dimach/unstable-3
Added new function to GT scanner
2017-09-03 14:43:42 +02:00
Blood-Asp
ef4a2d48a6 Merge pull request #1168 from Antifluxfield/patch-1
Correct description of regulator
2017-09-03 14:40:19 +02:00
Blood-Asp
2555acf75f Merge pull request #1147 from SLiMylya/addnewbattery
Add new zpm and uv battery
2017-09-03 14:38:59 +02:00
Johannes Gäßler
5e87d49f29 Fixed wrong IC2 Biogas energy density due to GT optimization 2017-09-01 21:07:31 +02:00
Johannes Gäßler
e965c09aab Revised Biomass Distillation Tower recipes in terms of EU density 2017-09-01 20:41:38 +02:00
Dimach
ded594c86c Patched ME energy tunnel, now they can emit GT energy. 2017-08-27 01:55:20 +03:00
Johannes Gäßler
3165853e4f Fixed a bug where the energy density of Biogas was calculated wrongly 2017-08-25 09:35:26 +02:00
Johannes Gäßler
0189b933e3 Revised Hydrochloric Acid recycling, Salt electrolyzation cost
Hydrochloric Acid can be recycled at 100% efficiency.
The production of Dimethylhydrazine, Tetrafluoroethylene,
Polydimethylsiloxane, and Hypochlorous Acid yields Diluted Hydrochloric
Acid, which can be recycled at 50% efficiency.

The energy cost of 21600 EU per 2 Salt -> Sodium + Chlorine has turned
out to be too high.
The cost is now 9600 EU.
2017-08-25 09:19:19 +02:00
Johannes Gäßler
01da9150f6 Added missing Tetraitromethane, Polymerization recipes 2017-08-24 09:58:14 +02:00
Johannes Gäßler
b5721d140b Fixed Nitric Oxide EUt, halved Ammonia cost
To prevent the construction of perpetua mobilia via Rocket Fuel the EU
cost of making Dimethylhydrazine has been increased.
2017-08-23 21:00:25 +02:00
Johannes Gäßler
8f2a365b78 Fixed inconsistent SMD capacitor recipes 2017-08-21 16:13:28 +02:00
Antifluxfield
eb749f64ca Use "/n " as seperator 2017-08-21 21:38:39 +08:00
Antifluxfield
f6482e63ae Use "/n " as seperator 2017-08-21 21:28:37 +08:00
Johannes Gäßler
2629510683 Fixed collision between Acetic Acid and Vinyl Chloride recipes 2017-08-21 14:23:51 +02:00
Johannes Gäßler
4eafe33685 Added Assembler recipes for Small Coils, can use Annealed Copper 2017-08-21 10:03:05 +02:00
Johannes Gäßler
57dbb05068 Added scalable Methane + Water -> Hydrogen + CarbonDioxide recipes 2017-08-21 09:29:16 +02:00
Johannes Gäßler
c2e4ebea6e Fixed EV Pumps using the wrong Rubber 2017-08-21 09:05:08 +02:00
Johannes Gäßler
f94d61a3d2 Fixed Large Chemical Reactor GUI, was wrongly using default before 2017-08-21 08:56:24 +02:00
Johannes Gäßler
97fc717f9a Fixed LCM desulfurization recipes in combination with CirChemUpdateFU 2017-08-21 08:42:24 +02:00
Antifluxfield
d5b0dcfa50 Multi-line tooltip of #1193 2017-08-21 09:59:47 +08:00
Antifluxfield
78e03914a3 Improve tooltip
Now the metaitems can automatically seperate its tooltip to multiple lines with "////".
2017-08-21 09:56:04 +08:00
Johannes Gäßler
bc58367801 Added missing Tetrafluoroethylene recipes 2017-08-20 17:54:57 +02:00
Johannes Gäßler
3edd505c7e All SMD Components now use Plastic, MV 2017-08-20 11:58:19 +02:00
Johannes Gäßler
3b39210348 Fixed desulfuriation recipes colliding with hydro-cracking recipes 2017-08-20 10:15:25 +02:00
Johannes Gäßler
1c8df8fb7f Fixed Titaniumtetrachloride temperature 2017-08-19 23:56:48 +02:00
Johannes Gäßler
c281488927 Merge branch 'unstable' into PyrometallurgyUpdate
Conflicts:
	src/main/java/gregtech/GT_Mod.java
	src/main/java/gregtech/api/enums/Materials.java
	src/main/java/gregtech/common/GT_Proxy.java
	src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java
	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
2017-08-19 23:46:31 +02:00