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

3528 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Aidan 5f81b48b50 Merge pull request #3169 from Vexatos/patch-12 
Update de_DE.lang
 2016-04-10 11:08:56 -04:00
Vexatos bc25cc21a0 Update de_DE.lang 2016-04-10 09:31:10 +02:00
aidancbrady 4227439a96 Use UUID instead of entity reference in teleporter calculations, fixed entity teleport 2016-04-05 09:52:37 -04:00
aidancbrady 176f82ab2f Gas Generator now scales burn rate to stored amount of gas 2016-04-03 12:50:29 -04:00
aidancbrady 9f1caa630a models 2016-04-02 10:23:32 -04:00
aidancbrady 641ed731f4 New round of machine models, updated Chemical Crystallizer side config defaults 2016-04-01 13:50:39 -04:00
aidancbrady 67372d703e Portable Teleporter remembers frequency, new side data functionality for blocks with non-configurable sides, fixed energy cubes not outputting up or down, fixed transmitter lighting 2016-03-31 20:17:00 -04:00
Aidan 58becdcc2c Merge pull request #3157 from LFalch/update-da-locale 
Update Danish locale
 2016-03-29 17:08:12 -04:00
LFalch 648fcbd04c Update Danish locale 
Correct a few previous mistakes
 2016-03-29 19:01:16 +02:00
aidancbrady adf783e679 Merge branch 'master' into development 
* master:
  More pt_BR update
  Update pt_BR lang
 2016-03-29 07:52:21 -04:00
Aidan 468b9b41bc Merge pull request #3155 from HanatakeYurii/patch-1 
Update fr_FR.lang for v9
 2016-03-29 07:51:49 -04:00
HanatakeYurii 1534abf200 Update fr_FR.lang for v9 
Hi, I tried to update the translation as far as I found differences. Feel free to tell me or correct yourself if I missed any change or made a mistake.
 2016-03-28 13:14:02 +02:00
Aidan 2101912964 Merge pull request #3151 from EzerArch/patch-1 
Update pt_BR lang
 2016-03-27 21:24:32 -04:00
aidancbrady 65a7469433 Side config fixes 2016-03-27 21:19:54 -04:00
aidancbrady 1f0895322b Fixes 2016-03-27 20:30:04 -04:00
aidancbrady b64108d1c6 New models and fixes 2016-03-27 20:08:02 -04:00
EzerArch 9fc9eb4cd3 More pt_BR update 
More improvements and fixes.
 2016-03-27 06:14:36 -03:00
EzerArch 882d9752aa Update pt_BR lang 
Full Brazilian Portuguese translation of Mekanism. Still has room for
improvements. European Portuguese to come.
 2016-03-27 02:03:46 -03:00
aidancbrady 14aea16e3a Texture fixes 2016-03-26 17:42:12 -04:00
aidancbrady e497a46bd6 Crash fix 2016-03-26 14:54:13 -04:00
aidancbrady 25866b39f9 Fixed fluid scaling issue 2016-03-26 13:28:48 -04:00
aidancbrady 42ca8c29b1 Fix to weird item texture winding bug. I don't know why I have to do this 2016-03-26 12:34:34 -04:00
aidancbrady 97bd7198d1 Texture fixes for @CyanideX 2016-03-26 01:39:22 -04:00
aidancbrady 9d22b7277c Added new models 2016-03-24 00:33:28 -04:00
aidancbrady 4a78cb65b1 Digital Miner now only accepts cable connections on certain sides 2016-03-23 19:51:37 -04:00
aidancbrady 44d9aa506f A few Formulaic Assemblicator fixes 2016-03-23 17:35:03 -04:00
aidancbrady b3954b88ee Further organized factory textures 2016-03-23 16:16:03 -04:00
aidancbrady df3762dc1b Add dynamic texture rendering to Formulaic Assemblicator 2016-03-23 15:43:14 -04:00
aidancbrady bfb17d45f6 Reorganized assets 2016-03-23 08:52:03 -04:00
aidancbrady ac16acb59a Fixed pumps not outputting 2016-03-22 20:37:16 -04:00
aidancbrady 461cb79704 Fixed Entangloporter not updating block surroundings 2016-03-22 19:48:47 -04:00
aidancbrady e6f4102087 New "InternalMultiblock" framework to allow for easier multiblock component management, added "hot" state to superheating elements 2016-03-22 19:29:18 -04:00
aidancbrady 5dcddaf25b Fixed glass render, added new Thermal Evaporation Plant computer integration 2016-03-22 17:18:55 -04:00
aidancbrady 5ed86f3f01 Extend security to generators, gas tanks and energy cubes 2016-03-21 23:14:38 -04:00
aidancbrady b83257d83b Fixed Wind Generator model, fixed crashes 2016-03-21 21:07:02 -04:00
aidancbrady 00e7a99cf3 Fixed recipe 2016-03-21 20:34:46 -04:00
aidancbrady c481180088 A few bug fixes, added recipes for Security Desk 2016-03-21 19:43:03 -04:00
aidancbrady a18da2ad27 Integrate security into more machines 2016-03-21 18:25:27 -04:00
aidancbrady f904c8b80c Start integrating security into all machinery. This is a very rough implementation, there's gonna be a lot of balance and corrections to make before release 2016-03-21 16:53:29 -04:00
aidancbrady 9c480954e3 Polished security desk interface and machine interaction. Need to start integrating now, so far only complete in metallurgic infuser 2016-03-21 13:30:59 -04:00
aidancbrady 062671cdc4 Added security desk 2016-03-21 08:15:49 -04:00
EzerArch a14864aea5 Merge pull request #2 from aidancbrady/master 
Sync with trunk
 2016-03-20 20:06:29 -03:00
aidancbrady 1b2aee283e Work on security framework 2016-03-19 22:03:17 -04:00
aidancbrady e53c00d2b8 Fixed reactors shutting off when unloaded 2016-03-17 20:11:38 -04:00
aidancbrady 650b725567 Use handy Forge methods for damage display instead of setting item damage in gas/energy/fluid indicators 2016-03-17 14:23:53 -04:00
aidancbrady 97eeeb5ed3 Better Factory energy usage display, added new reactor LUA commands 2016-03-17 09:28:45 -04:00
aidancbrady 38a68541c4 Tiered Bins, better tier management! 2016-03-16 21:41:55 -04:00
aidancbrady a5c5a093fa Cleanup 2016-03-15 20:06:35 -04:00