tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
3617 commits 2 branches 0 tags 102 MiB
Commit graph

3617 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ezer'Arch
cb9c515e42 Merge pull request #6 from EzerArch/master 
Update pt_PT and pt_BR
 2016-07-03 23:04:13 -03: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
Ezer'Arch
7b37a3d413 Merge pull request #5 from aidancbrady/master 
Sync with original repo
 2016-07-03 19:51:28 -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
0594dede1e Merge pull request #3415 from freemanovec/master 
Finished Czech localization
 2016-06-27 19:56:28 -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
EzerArch
ff7e900f1c Merge pull request #3 from aidancbrady/master 
Sync with original repo
 2016-06-18 18:38:22 -03:00
aidancbrady
7d64dde8be Merge branch 'master' into development 
* master:
  Update pt_BR.lang
 2016-06-10 17:05:36 -04:00
Aidan
35516ce1c4 Merge pull request #3343 from AlterAkima/patch-1 
Update pt_BR.lang
 2016-06-10 11:05:19 -10: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
Aidan
888ef50bf1 Merge pull request #3313 from karakufire/loc_ja-JP 2016-06-02 15:50:51 -04: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