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

1996 commits

This branch
This branch
All branches
Author SHA1 Message Date
Aidan C. Brady 23b6ce5105 Merge branch 'development' into 1.8 2014-07-13 23:52:29 -04:00
Aidan C. Brady 1094475344 Fixed teleporter crash, fixed asset issue 2014-07-13 23:52:17 -04:00
Aidan C. Brady ad0a71ee71 Merge branch 'development' into 1.8 2014-07-13 23:34:28 -04:00
Aidan C. Brady 3fc1ec00e9 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-07-13 23:34:13 -04:00
Aidan C. Brady 17f8fa11da Implemented robit crash fix 2014-07-13 23:34:01 -04:00
Aidan e466808a22 Merge pull request #1509 from Mierzen/development 
Lang file changes
 2014-07-13 23:31:10 -04:00
Aidan C. Brady ddb6140513 Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8 2014-07-13 23:27:28 -04:00
Aidan C. Brady 9592d7f024 Flamethrower fixes! 2014-07-13 23:27:23 -04:00
Ben Spiers 11e21e1957 Start on implementation of lasers. 2014-07-14 01:34:26 +01:00
Mierzen 24b15ee90f Missed one missing tooltip (haha) 2014-07-13 22:16:46 +02:00
Mierzen 6fd14886c0 Language file changes: 
Add missing tooltips! (Chemical oxidizer and infuser), please check!
Change "Round robin" to "Round-robin"
Make tooltips more 'square'
 2014-07-13 21:54:47 +02:00
Ben Spiers 85455a05e9 Merge branch 'development' into 1.8 2014-07-13 19:58:50 +01:00
Ben Spiers 700cc76c35 Fix a different, unrelated OreDict issue. 2014-07-13 19:58:00 +01:00
Ben Spiers 39c6b45a2c Fix Iron Dust smelting issue. Close #1478 2014-07-13 19:58:00 +01:00
Anton 3161e916d7 Update ru_RU.lang 2014-07-13 19:58:00 +01:00
Mierzen c893a73490 Update en_GB, add en_ZA 2014-07-13 19:57:59 +01:00
Mierzen b650ed463d Revert "Capitalize some language keys (yes, no and AD modes)" 
This reverts commit 9c2582a26e.
 2014-07-13 20:56:33 +02:00
Ben Spiers d8b9ff7a20 Merge branch 'master' into development 2014-07-13 19:56:28 +01:00
Ben Spiers c560bdc2e1 Fix a different, unrelated OreDict issue. 2014-07-13 19:53:41 +01:00
Ben Spiers 3e3bf2c25c Fix Iron Dust smelting issue. Close #1478 2014-07-13 19:53:41 +01:00
Mierzen 9c2582a26e Capitalize some language keys (yes, no and AD modes) 2014-07-13 20:21:11 +02:00
Mierzen 7328fd4400 Remove inherited language strings from en_GB and en_ZA 2014-07-13 20:19:08 +02:00
Aidan eecfd68798 Merge pull request #1505 from Mierzen/master 
Update en_GB, add en_ZA
 2014-07-13 13:34:39 -04:00
Aidan f92b682d0e Merge pull request #1506 from Adaptivity/patch-4 
Update ru_RU.lang
 2014-07-13 13:34:27 -04:00
Aidan C. Brady 1a458834a8 Work on making flamethrowers work nice. Still need to get first person neutral particles down. 2014-07-13 13:32:28 -04:00
Anton afe69a0f9f Update ru_RU.lang 2014-07-13 18:41:16 +04:00
Mierzen 0872cdbf04 Update en_GB, add en_ZA 2014-07-13 13:11:00 +02:00
Aidan C. Brady 6fbfd22583 Merge branch 'development' into 1.8 2014-07-13 00:16:05 -04:00
Ben Spiers 4bea4c62fd Remove stray @Method 
Should fix #1500
 2014-07-13 05:06:57 +01:00
Aidan C. Brady 3f7de46991 Just about polished off baby skeletons, started on getting the Flamethrower to render with correct scale and orientation 2014-07-12 23:59:39 -04:00
Aidan C. Brady 6cc7efc64b Merge branch 'master' into 1.8 2014-07-12 22:53:21 -04:00
Aidan C. Brady c223eabb95 Fixed Combiner NEI texture, fixed Cardboard Box not working 2014-07-12 22:52:13 -04:00
Aidan C. Brady 6271284436 Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8 2014-07-12 22:35:04 -04:00
Aidan C. Brady 9abc111ecd Baby Skeletons, started work on Flamethrower 2014-07-12 22:34:58 -04:00
Ben Spiers 0638cdb61c More work on Fusion Reactor and Lasers 2014-07-13 02:46:47 +01:00
Aidan C. Brady cf6f5ab387 Bump versions to 8.0.0 2014-07-12 18:52:46 -04:00
Aidan C. Brady 246c9426be Merge branch 'development' into 1.8 2014-07-12 18:50:05 -04:00
Aidan C. Brady cfdaf37e4b Moved MFR back into api package. 2014-07-12 16:10:10 -04:00
Ben Spiers 0758ad752b Fix un-checked MFR API usage 2014-07-12 21:04:33 +01:00
Aidan C. Brady 79f27e9d11 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2014-07-12 16:02:32 -04:00
Aidan C. Brady 369eb012af Fixed Portable Tank transfer issue, fixed inventories not being sustained, fixed Logistical Transporter crash 2014-07-12 16:02:21 -04:00
Ben Spiers a8bfe29c8e Depend on EnderIO and ExtraUtilities 
If this doesn't fix it I don't know what will
 2014-07-12 19:03:17 +01:00
Ben Spiers f095cbd3fd Fix the BuildCraft API dependency 
Hopefully fix some issues.
 2014-07-12 18:46:43 +01:00
Aidan 896dd4de3f Merge pull request #1483 from Mierzen/patch-2 
Update README.md (1.7.2 -> 1.7.10)
 2014-07-12 13:09:12 -04:00
Aidan C. Brady 390f0b06bc Force Mekanism to load after FMP 2014-07-12 12:59:44 -04:00
Aidan C. Brady d72ce6532b Updated Forge to 10.13.0.1180. 2014-07-12 12:35:42 -04:00
Mierzen bba13581f7 Update README.md 2014-07-12 11:06:25 +02:00
Aidan C. Brady ab0f002c5e Fixed FMP version! 2014-07-12 01:17:21 -04:00
Aidan C. Brady 5bc7288bc2 Mekanism v7...official release. 2014-07-12 00:05:19 -04:00
Aidan C. Brady f597bce107 Updated Forge to 1179 2014-07-11 22:25:06 -04:00