Commit graph

2009 commits

Author SHA1 Message Date
aidancbrady
1d51dd34dc Better Structural Glass recipe 2016-07-16 12:20:56 -04:00
aidancbrady
88ead85f0e Fixed Portable Teleporter issue, fixed compounded Factory localization, add upgrades support to Solar Neutron Activator 2016-07-16 12:16:55 -04:00
aidancbrady
ca52ba521b Fixed side output issue 2016-07-15 00:06:15 -04:00
aidancbrady
e4eb04ea13 Fixed texture registration issue 2016-07-13 17:19:23 -04:00
aidancbrady
773d53e93a Fixed Logistical Transporter network pathfinding 2016-07-13 17:07:02 -04:00
aidancbrady
61906fc309 Fixed Digital Miner and Logistical Sorter interfaces 2016-07-13 00:24:45 -04:00
aidancbrady
6897b9a3ba Allow wildcards in transporter oredict filters again 2016-07-12 23:05:36 -04:00
aidancbrady
ae77ce0e19 Better text field management 2016-07-10 13:53:13 -04:00
aidancbrady
9005e589e0 Fixed turbine crash 2016-07-07 00:32:47 -04:00
aidancbrady
5fa3308565 Add necessary networking to Reactor Port 2016-07-06 17:56:40 -04:00
aidancbrady
52daff9f67 Better tooltips 2016-07-06 17:53:14 -04:00
aidancbrady
42f27058c2 Actually fix tier installers 2016-07-06 17:36:29 -04:00
aidancbrady
7a117e20dc Add Silicon crusher recipe, fixed Tier Installers 2016-07-06 17:34:29 -04:00
aidancbrady
28846dcb73 Rename Factory Installer to Tier Installer, add recipe for Saturating Condenser, add tier upgrade support for Energy Cube, Gas Tank, Fluid Tank and Bin 2016-07-06 17:21:24 -04:00
aidancbrady
95c0ad4a73 Bump version to 9.1, add Laser Amplifier comparator support, add Saturating Condensers to recycle water from Industrial Turbines 2016-07-06 16:56:24 -04:00
aidancbrady
53a9204974 Fixed Robit AI 2016-07-05 18:23:22 -04:00
aidancbrady
cdf4b16ec1 Fixed Robit dupe glitch 2016-07-05 17:30:34 -04:00
aidancbrady
f4582dbccf Fixed the stupid invalid frequency issue 2016-07-05 17:01:58 -04:00
Ezer'Arch
a6b3ca7e9e Update pt_PT and pt_BR
Minor change.
2016-07-03 23:00:31 -03:00
Ezer'Arch
108cc0f3ee Creates pt_PT and updates pt_BR
Creates the European Portuguese translation and updates Brazilian
Portuguese translation.
2016-07-03 20:59:59 -03:00
aidancbrady
fdc21d8de5 Fixed break crash 2016-07-03 02:07:14 -04:00
aidancbrady
330756e5a7 Added configurable steam auto-output to Reactor Port 2016-07-02 20:33:27 -04:00
aidancbrady
41ea222aab Added Fluid Tank comparator support, fixed Gas Tank comparator support 2016-06-30 12:45:15 -04:00
aidancbrady
3b214376ba Implement config option for operators to bypass security, added turbine dump/dump excess functionality 2016-06-30 12:25:20 -04:00
aidancbrady
8f8f1751ec Fixed Tesseract and Flux Duct support 2016-06-30 11:14:21 -04:00
aidancbrady
0b9a71162a Updated IC2 API, fixed integration 2016-06-30 11:07:52 -04:00
aidancbrady
b77ca6ff0c Revert "Remove deprecated gas API methods"
This reverts commit c5a414df37.
2016-06-30 01:03:13 -04:00
aidancbrady
425b43a4c4 Reactor Ports now auto-eject steam 2016-06-30 00:46:02 -04:00
aidancbrady
c5a414df37 Remove deprecated gas API methods 2016-06-29 19:58:13 -04:00
aidancbrady
163e37de86 Merge branch 'master' into development
* master:
  Finished czech localization
  847/1085
  797/1085
  636/1085
  602/1085
  508/1085
  Revert "Revert "114/1085 translations completed""
  Revert "114/1085 translations completed"
  114/1085 translations completed
  Added czech localization file
2016-06-27 19:57:27 -04:00
Aidan
02af729175 Merge pull request #3409 from karakufire/development
Update ja-JP.lang
2016-06-27 19:56:19 -04:00
Jakub Rohla
09fa8f9f5a Finished czech localization 2016-06-27 20:32:20 +02:00
Jakub Rohla
961c84304e 847/1085 2016-06-27 20:04:06 +02:00
Jakub Rohla
e320616c37 797/1085 2016-06-27 17:42:02 +02:00
Jakub Rohla
15804b0b96 636/1085 2016-06-27 14:29:44 +02:00
Jakub Rohla
04e3fa195c 602/1085 2016-06-27 14:20:57 +02:00
Jakub Rohla
546dd1e9d5 508/1085 2016-06-27 13:54:28 +02:00
Jakub Rohla
8b335bdc04 Revert "Revert "114/1085 translations completed""
This reverts commit 1c6b74d854.
2016-06-27 07:08:16 +02:00
Jakub Rohla
1c6b74d854 Revert "114/1085 translations completed"
This reverts commit 9bc65d4593.
2016-06-27 07:07:53 +02:00
Jakub Rohla
9bc65d4593 114/1085 translations completed 2016-06-27 07:07:02 +02:00
karakufire
2358c22fa8 Update ja-JP.lang 2016-06-27 11:45:45 +09:00
aidancbrady
8a166e108a Fixed heat displays 2016-06-26 15:48:47 -04:00
freemanovec
f450f6ddfe Added czech localization file 2016-06-24 09:29:03 +02:00
aidancbrady
b644fbc83f Fixed Bin amount render position 2016-06-22 14:25:20 -04:00
aidancbrady
44ecdd41d0 Bump version to 9.0.3, change Wind Generator weather category, fix Logistical Sorter sound config bypass, fixed Thermal Evaporation Plant internal render 2016-06-22 14:20:22 -04:00
aidancbrady
7d64dde8be Merge branch 'master' into development
* master:
  Update pt_BR.lang
2016-06-10 17:05:36 -04:00
Patric Alexandre
b0546722d8 Update pt_BR.lang 2016-06-10 17:06:22 -03:00
aidancbrady
0723168c4c Allow shift-right clicking machines with upgrades 2016-06-10 11:51:47 -04:00
aidancbrady
6340bb3cdc Fixed NBT reference losses 2016-06-10 11:30:03 -04:00
aidancbrady
e1a5bf13c7 Fixed Thermal Evaporation Controller computer integration 2016-06-10 11:17:26 -04:00
aidancbrady
f29fe502a9 Add config option for transmitter alloy upgrades 2016-06-10 11:15:15 -04:00
aidancbrady
e18570b679 Fixed transmitter crash, fixed entangloporter frequency issue, fixed PRC muffling upgrades 2016-06-10 11:11:41 -04:00
Aidan
17c9c5910a Merge pull request #3306 from MineWitherMC/patch-1 2016-06-03 09:30:59 -10:00
karakufire
94eec14471 ja-JP.lang - change translation "Chemical Infuser" and "Chemical Injection Chamber" 2016-06-02 11:47:13 +09:00
MultiDragon
d70e2a3381 Update ru_RU.lang
Fix some long-standing issues (with MekGenerators) and change descriptions to fit Mek v9
2016-05-30 20:15:41 +03:00
aidancbrady
985e5afbfc Fixed Turbines unable to be formed in other dimensions 2016-05-28 02:24:50 -04:00
aidancbrady
02d2aa1550 Bump version to 9.0.2 2016-05-28 02:02:31 -04:00
aidancbrady
38490db21d Fixed Personal Chest crash, bumped default Fuelwood Heater generation, added some null checks to prevent crashes 2016-05-28 02:01:21 -04:00
aidancbrady
5fdc677926 Fixed outputting energy above Integer.MAX_VALUE to other mods, fixed tiered factories not supporting muffling upgrades, fixed boiler valve height interaction 2016-05-23 18:51:08 -04:00
aidancbrady
1e0d04ab2b Fixed Energy Cube output, fixed multiblock max size, fixed Electric Pump heavy water pumping 2016-05-22 17:58:25 -04:00
aidancbrady
18bd17dafe Fixed Security Desk not invalidating 2016-05-22 03:29:01 -04:00
aidancbrady
e208ddc82d Fixed Turbine Stats crash 2016-05-21 14:01:34 -04:00
aidancbrady
cf3dc591e0 Fixed Turbine container crash 2016-05-21 13:58:09 -04:00
aidancbrady
ffd39dc20d Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
# By karakufire
# Via Aidan (1) and karakufire (1)
* 'development' of https://github.com/aidancbrady/Mekanism:
  ja_JP.lang - translate generators and ores tooltip, fix some entries
  ja_JP.lang - translate general machinery and Blocks(without ores) tooltip.
  ja_JP.lang - little fix/change
  ja_JP.lang - fix/change some entries
  ja_JP.lang - translate tooltip and gui text
  ja_JP.lang - gui and tooltip translation progress
  ja_JP.lang - fix/change some translation(items and blocks)
  ja_JP.lang tweak some entries based on v9
2016-05-21 13:52:34 -04:00
aidancbrady
0e0f9584f3 Bumped version, fixed Steel Casing recipe, fixed erratic heat behavior, fixed Turbine render crash, added missing localization, fixed Bin crafting crash 2016-05-21 13:52:28 -04:00
Aidan
711fa80ed8 Merge pull request #3227 from karakufire/loc_ja-JP
Update ja-JP.lang for v9
2016-05-21 12:46:31 -04:00
karakufire
5bd1882b1f ja_JP.lang - translate generators and ores tooltip, fix some entries 2016-05-21 04:09:49 +09:00
karakufire
fc90f64474 ja_JP.lang - translate general machinery and Blocks(without ores) tooltip. 2016-05-21 03:31:24 +09:00
karakufire
31138e893f ja_JP.lang - little fix/change 2016-05-21 03:29:05 +09:00
karakufire
935d4bfb46 ja_JP.lang - fix/change some entries 2016-05-21 03:13:38 +09:00
Vexatos
7f068231d0 Update de_DE.lang 2016-05-20 18:36:46 +02:00
karakufire
1a6ba6b455 ja_JP.lang - translate tooltip and gui text 2016-05-20 14:39:27 +09:00
karakufire
20203cdcd6 ja_JP.lang - gui and tooltip translation progress 2016-05-20 03:18:39 +09:00
karakufire
d3b2865051 ja_JP.lang - fix/change some translation(items and blocks) 2016-05-20 03:15:47 +09:00
karakufire
a7c61f1e8d ja_JP.lang tweak some entries based on v9 2016-05-20 03:15:47 +09:00
aidancbrady
32659f0a49 Remove traces of 'dump' buttons 2016-05-18 11:25:05 -04:00
aidancbrady
7ae60615e2 Fixed packet security 2016-05-17 13:49:55 -04:00
aidancbrady
1c90980d68 Fixed 'other dust' registration 2016-05-17 13:10:51 -04:00
aidancbrady
9ec5606ec0 Better fake player reporting, thanks to @DraksterAU 2016-05-17 12:37:47 -04:00
Aidan
78b11662e6 Merge pull request #3216 from sfmiyuki/patch-2
Update zh_CN.lang
2016-05-16 19:15:04 -04:00
MultiDragon
e1d0c39fc9 Update ru_RU.lang
I believe this will finish the LARGE amount of commits.
2016-05-15 21:07:12 +03:00
sfmiyuki
a7b4c1f262 Update zh_CN.lang
So...Shall I submit in here?
2016-05-15 13:21:25 +08:00
MultiDragon
eecb73f52f Update ru_RU.lang 2016-05-13 17:11:20 +03:00
MultiDragon
acac114a3a Update ru_RU.lang
hotfix fuelwood heater
2016-05-13 17:10:32 +03:00
MultiDragon
b2cdda00f0 Update ru_RU.lang
Update ru_RU to v9
2016-05-13 17:06:44 +03:00
aidancbrady
ce3bb08411 Fixed Fusion Reactor air block check 2016-05-12 15:27:04 -04:00
aidancbrady
f51221f5ac Implemented custom resistance for Refined Obsidian 2016-05-11 23:56:25 -04:00
aidancbrady
627a2597db Lead Dust fix, turns out I was only calling it once 2016-05-11 01:30:57 -04:00
Aidan
953428ee3f Merge pull request #3203 from Vexatos/patch-14
Update de_DE.lang
2016-05-05 18:46:14 -04:00
aidancbrady
e9802d063f Block texture updates 2016-05-04 22:18:11 -04:00
aidancbrady
e999680193 Machine icon bug fix 2016-05-04 20:54:53 -04:00
aidancbrady
4f7639f681 Updated transmitter textures 2016-05-04 17:32:57 -04:00
aidancbrady
f1fb6f3c06 Remove old assets 2016-05-04 16:50:23 -04:00
aidancbrady
39f604311a Fixed factory upgrade issue 2016-05-04 14:02:15 -04:00
Vexatos
0d53e5ef10 Update de_DE.lang 2016-05-04 06:17:47 +02:00
aidancbrady
8c6a7c01ef Fancy Energy Cube colors! 2016-05-03 18:54:53 -04:00
aidancbrady
feb22b2543 A better fix 2016-05-03 17:00:27 -04:00
aidancbrady
bc72ea2751 Crash check 2016-05-03 16:45:42 -04:00
aidancbrady
dd9de638b6 Side config fixes 2016-05-03 00:41:44 -04:00
aidancbrady
dc4c882827 Bump API version numbers 2016-05-02 23:02:37 -04:00
aidancbrady
0ddc8da53e Remove Lead Dust clone 2016-05-02 23:00:49 -04:00
aidancbrady
b44c6f374a Separate vertical and horizontal textures for small transmitters 2016-05-02 01:25:42 -04:00
aidancbrady
4720e8f7af Fixed Energy Cube crafting 2016-04-30 14:15:09 -04:00
aidancbrady
fe99d25305 Add network layer to make security preferences persistent 2016-04-30 11:26:12 -04:00
aidancbrady
c4520a072b Crash fixes 2016-04-30 01:24:14 -04:00
aidancbrady
d98c4c181e Crash fix 2016-04-29 22:56:09 -04:00
aidancbrady
cdcaabe59c Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
# By Vexatos
# Via Aidan (1) and Vexatos (1)
* 'development' of https://github.com/aidancbrady/Mekanism:
  Update de_DE.lang
2016-04-29 22:33:21 -04:00
aidancbrady
1038c606ef Fixed Fuelwood Heater side interaction 2016-04-29 22:28:31 -04:00
Vexatos
90ddf20b34 Update de_DE.lang 2016-04-29 18:46:08 +02:00
aidancbrady
1ddb56c226 More unit fixes 2016-04-28 18:35:36 -04:00
aidancbrady
32c1708cd2 Add appropriate transmission priorities for side config interfaces, fixed temp units 2016-04-28 10:00:08 -04:00
aidancbrady
feb48db20e Fixed Resistive Heater energy unit conversion 2016-04-28 00:50:51 -04:00
aidancbrady
f84e5293bf Gas Generator fixes 2016-04-28 00:21:06 -04:00
aidancbrady
ba8e5e198b Fixed resetting of gas data in Gas-Burning Generator 2016-04-27 23:37:01 -04:00
aidancbrady
16c7dc92af More rendering fixes 2016-04-27 19:08:01 -04:00
aidancbrady
47fd07f5c3 Rendering fixes 2016-04-27 19:05:53 -04:00
aidancbrady
5aa8041049 Fixed WAILA interactions 2016-04-26 22:47:07 -04:00
aidancbrady
6b106909f5 Fixed Bin WAILA display 2016-04-25 23:08:06 -04:00
aidancbrady
973339fa9a Fixed Fluid and Gas Tank WAILA displays 2016-04-25 23:06:25 -04:00
aidancbrady
c2aa94d633 Player-relative block hardness for security-configured machines 2016-04-25 23:02:50 -04:00
aidancbrady
42cb905d3c Tiny cleanup 2016-04-25 18:10:35 -04:00
aidancbrady
1325b779b0 Prefilled Gas Tanks option 2016-04-25 17:43:11 -04:00
Aidan
541a802228 Merge pull request #3186 from Buildstarted/dev
Peripherals api includes invalid indexes for methods with string parameters
2016-04-25 14:27:58 -04:00
Ben Dornis
7a77c4f2c0 fixed method indexes for peripherals 2016-04-25 09:58:11 -07:00
aidancbrady
5b893a1a81 Fuelwood Heater textures 2016-04-23 20:26:01 -04:00
aidancbrady
f645ced8cf Fixed orphaned TEs. I hope this never is an issue again 2016-04-23 19:35:34 -04:00
aidancbrady
112c20c521 Fixed falling through certain Generator-related blocks 2016-04-23 18:59:38 -04:00
aidancbrady
65be977161 Formulaic Assemblicators are now 1000 times more efficient, combined with the last commit. I'm proud 2016-04-23 18:51:55 -04:00
aidancbrady
8f96e51142 Reduced Formulaic Assemblicator CPU usage by a factor of 10 2016-04-23 17:44:14 -04:00
aidancbrady
2873c0c797 Added Fuelwood Heater, currently has no texture. After doing some server timing tests, the last thing we need to make efficient is the Formulaic Assemblicator 2016-04-23 17:09:01 -04:00
aidancbrady
ec69b2675e Formulaic Assemblicator fixes 2016-04-23 13:02:47 -04:00
aidancbrady
b97c6d8f4b Quantum Entangloporter model! 2016-04-22 23:15:18 -04:00
aidancbrady
2838794ec3 Factory installers now maintain security 2016-04-22 07:56:15 -04:00
aidancbrady
9d50b8773b More fixes 2016-04-21 23:46:47 -04:00
aidancbrady
5c495de348 Fixed block placement checks 2016-04-21 23:36:02 -04:00
aidancbrady
4789235ac0 Fixed Resistive Heater texture 2016-04-21 22:49:02 -04:00
aidancbrady
cf6b493d4c Fixed Precision Sawmill not accepting muffling upgrade 2016-04-21 22:48:42 -04:00
aidancbrady
4436ca5b01 Chargepad overlay 2016-04-20 19:57:29 -04:00
aidancbrady
8b995f407f Heat Generator and Restrictive Heater overlays 2016-04-20 19:08:06 -04:00
aidancbrady
d6bce421f4 Oredictionificator GUI fixes 2016-04-19 16:13:59 -04:00
aidancbrady
12c2c6099f New assets and overlays! 2016-04-19 13:35:10 -04:00
aidancbrady
a95f231fcc Energy Cube fancy render 2016-04-18 14:06:33 -04:00
aidancbrady
aeecb57978 Fixed internal multi blocks of Thermoelectric Boiler not updating 2016-04-17 23:12:33 -04:00
aidancbrady
a891ed02ac More new textures 2016-04-16 19:33:31 -04:00
aidancbrady
7387f15b64 New and fixed models! Energy Cubes look awesome. 2016-04-16 17:14:02 -04:00
aidancbrady
d4c2ce36e9 Model fixes! 2016-04-14 16:13:18 -04:00
aidancbrady
982749bb47 Resistive Heater model, fixed Fusion Reactor 2016-04-14 15:54:52 -04:00
aidancbrady
6fac6c3f22 Remove alt textures 2016-04-11 16:36:12 -04:00
aidancbrady
6522c4784a Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
# By Vexatos
# Via Aidan (1) and Vexatos (1)
* 'development' of https://github.com/aidancbrady/Mekanism:
  Update de_DE.lang
2016-04-11 16:32:07 -04:00
aidancbrady
cc0766be48 Loads of new assets 2016-04-11 16:32:01 -04:00