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

3791 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Bogdan
ca1a3dfa23 fix type for FFoKC 2016-06-04 17:10:31 +03: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
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
Aidan
ada8823bb9 Merge pull request #3226 from Vexatos/patch-15 
Update de_DE.lang
 2016-05-20 14:10:59 -04: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
Aidan
e4b8fe5931 Merge pull request #3213 from MineWitherMC/development 
v9 russian localisation
 2016-05-16 19:14:52 -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