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

3518 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Aidan dcc961e08a Merge pull request #3196 from Vexatos/patch-13 
Update de_DE.lang
 2016-04-29 14:57:56 -04:00