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

1904 commits

Author SHA1 Message Date
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
Vexatos
90ddf20b34 Update de_DE.lang 2016-04-29 18:46:08 +02:00
aidancbrady
1ddb56c226 More unit fixes 2016-04-28 18:35:36 -04:00
aidancbrady
32c1708cd2 Add appropriate transmission priorities for side config interfaces, fixed temp units 2016-04-28 10:00:08 -04:00
aidancbrady
feb48db20e Fixed Resistive Heater energy unit conversion 2016-04-28 00:50:51 -04:00
aidancbrady
f84e5293bf Gas Generator fixes 2016-04-28 00:21:06 -04:00
aidancbrady
ba8e5e198b Fixed resetting of gas data in Gas-Burning Generator 2016-04-27 23:37:01 -04:00
aidancbrady
16c7dc92af More rendering fixes 2016-04-27 19:08:01 -04:00
aidancbrady
47fd07f5c3 Rendering fixes 2016-04-27 19:05:53 -04:00
aidancbrady
5aa8041049 Fixed WAILA interactions 2016-04-26 22:47:07 -04:00
aidancbrady
6b106909f5 Fixed Bin WAILA display 2016-04-25 23:08:06 -04:00
aidancbrady
973339fa9a Fixed Fluid and Gas Tank WAILA displays 2016-04-25 23:06:25 -04:00
aidancbrady
c2aa94d633 Player-relative block hardness for security-configured machines 2016-04-25 23:02:50 -04:00
aidancbrady
42cb905d3c Tiny cleanup 2016-04-25 18:10:35 -04:00
aidancbrady
1325b779b0 Prefilled Gas Tanks option 2016-04-25 17:43:11 -04:00
Aidan
541a802228 Merge pull request #3186 from Buildstarted/dev 
Peripherals api includes invalid indexes for methods with string parameters
 2016-04-25 14:27:58 -04:00
Ben Dornis
7a77c4f2c0 fixed method indexes for peripherals 2016-04-25 09:58:11 -07:00
aidancbrady
5b893a1a81 Fuelwood Heater textures 2016-04-23 20:26:01 -04:00
aidancbrady
f645ced8cf Fixed orphaned TEs. I hope this never is an issue again 2016-04-23 19:35:34 -04:00
aidancbrady
112c20c521 Fixed falling through certain Generator-related blocks 2016-04-23 18:59:38 -04:00
aidancbrady
65be977161 Formulaic Assemblicators are now 1000 times more efficient, combined with the last commit. I'm proud 2016-04-23 18:51:55 -04:00
aidancbrady
8f96e51142 Reduced Formulaic Assemblicator CPU usage by a factor of 10 2016-04-23 17:44:14 -04:00
aidancbrady
2873c0c797 Added Fuelwood Heater, currently has no texture. After doing some server timing tests, the last thing we need to make efficient is the Formulaic Assemblicator 2016-04-23 17:09:01 -04:00
aidancbrady
ec69b2675e Formulaic Assemblicator fixes 2016-04-23 13:02:47 -04:00
aidancbrady
b97c6d8f4b Quantum Entangloporter model! 2016-04-22 23:15:18 -04:00
aidancbrady
2838794ec3 Factory installers now maintain security 2016-04-22 07:56:15 -04:00
aidancbrady
9d50b8773b More fixes 2016-04-21 23:46:47 -04:00
aidancbrady
5c495de348 Fixed block placement checks 2016-04-21 23:36:02 -04:00
aidancbrady
4789235ac0 Fixed Resistive Heater texture 2016-04-21 22:49:02 -04:00
aidancbrady
cf6b493d4c Fixed Precision Sawmill not accepting muffling upgrade 2016-04-21 22:48:42 -04:00
aidancbrady
4436ca5b01 Chargepad overlay 2016-04-20 19:57:29 -04:00
aidancbrady
8b995f407f Heat Generator and Restrictive Heater overlays 2016-04-20 19:08:06 -04:00
aidancbrady
d6bce421f4 Oredictionificator GUI fixes 2016-04-19 16:13:59 -04:00
aidancbrady
12c2c6099f New assets and overlays! 2016-04-19 13:35:10 -04:00
aidancbrady
a95f231fcc Energy Cube fancy render 2016-04-18 14:06:33 -04:00
aidancbrady
aeecb57978 Fixed internal multi blocks of Thermoelectric Boiler not updating 2016-04-17 23:12:33 -04:00
aidancbrady
a891ed02ac More new textures 2016-04-16 19:33:31 -04:00
aidancbrady
7387f15b64 New and fixed models! Energy Cubes look awesome. 2016-04-16 17:14:02 -04:00
aidancbrady
d4c2ce36e9 Model fixes! 2016-04-14 16:13:18 -04:00
aidancbrady
982749bb47 Resistive Heater model, fixed Fusion Reactor 2016-04-14 15:54:52 -04:00
aidancbrady
6fac6c3f22 Remove alt textures 2016-04-11 16:36:12 -04:00
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
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
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
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
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
aidancbrady
6b73b4153c Fixed misbehaving collision boxes 2016-03-15 19:44:16 -04:00
aidancbrady
ca7fc4aaf4 Formulaic Assemblicators are cool! 2016-03-15 19:30:16 -04:00
aidancbrady
9c8e392638 Loads more work on Formulaic Assemblicators. Seem to be about polished! 2016-03-15 19:07:22 -04:00
aidancbrady
779c2c49e7 Lots of work on Formulaic Assemblicators, still need to do a good bit of polishing 2016-03-15 17:34:17 -04:00
aidancbrady
1dfc35c6dd Fixed a small Digital Miner issue, fixed Adv. Solar Gen model 2016-03-15 00:15:19 -04:00
aidancbrady
a87b088be6 Work on Formulaic Assemblicator, also added some new fancy models from @CyanideX! 2016-03-14 23:57:37 -04:00
aidancbrady
6f4e73d15e Work on Formulaic Assemblicator, many fixes 2016-03-12 11:43:44 -05:00
aidancbrady
f31e32fcf2 More Assemblicator work, added Crafting Formula item 2016-03-06 19:05:34 -05:00
aidancbrady
a247a80d53 Work on Formulaic Assemblicator, got a lot more of the core logic done than I was expecting to 2016-03-06 17:53:16 -05:00
aidancbrady
2db6fde118 EnergyNetwork now only distributes demanded energy to acceptors instead of forcing transfer, should fix interaction issues 2016-03-06 13:51:11 -05:00
aidancbrady
1eff6ad6b8 Ship with CoFH energy API (as well as a few item tidbits). It's about time 2016-03-06 12:42:04 -05:00
aidancbrady
34d55f72ea More fluid container integration, removed dead code 2016-03-06 02:57:32 -05:00
aidancbrady
d332ad49b7 More consolidated fluid container management- I've been meaning to get to this for a long time 2016-03-06 02:15:56 -05:00
aidancbrady
d77de295f2 Modified factory-capable machine side data to match that of factories, allowing for configuration preservation 2016-03-05 19:33:02 -05:00
aidancbrady
b13d8ee1ab Fixed fluid duplication 2016-03-05 18:48:49 -05:00
aidancbrady
13996faacb Better particle rendering, bubbles when scuba tank is active, improved jetpack hover mode to disable when player is grounded 2016-03-05 18:28:52 -05:00
aidancbrady
4e41b46df7 Fix up Bin rendering 2016-03-05 15:18:40 -05:00
aidancbrady
866c76bafe Redesigned Filter Cards to serve as Configuration Cards, fixed inventory interaction bug, fixed Creative Energy Cube bug, added new recipes 2016-03-05 13:17:58 -05:00
aidancbrady
668643e663 Entangloporters work perfectly! 2016-03-04 21:58:13 -05:00
aidancbrady
f8f8dfa737 More work on entangloporters 2016-03-04 13:14:48 -05:00
aidancbrady
c03b712ed2 More work. I'm gonna let the configuration component determine send/receive instead of cluttering the GUI more 2016-03-04 12:07:34 -05:00
aidancbrady
8bd6b6e367 Merge branch 'master' into development 
* master:
  Part pt_BR update
 2016-03-04 11:06:31 -05:00
aidancbrady
ad15e359ac Work on Quantum Entangloporters. I get the feeling this is gonna be a big project 2016-03-04 11:06:05 -05:00
EzerArch
679aa28dd3 Part pt_BR update 
Partial pt_BR locale update.
 2016-03-02 12:05:26 -03:00
aidancbrady
cfb0986a48 Added fancy graphs to display boil rate and max boil value of boilers, boiler valves now connect to corresponding tanks of multiblock based on location 2016-03-01 13:37:19 -05:00
aidancbrady
382116b659 Hopefully final build fix 2016-03-01 10:29:43 -05:00
aidancbrady
30fbfc32d6 Another try 2016-03-01 10:26:57 -05:00
aidancbrady
8b9098b350 Another build fix attempt 2016-03-01 10:25:06 -05:00
aidancbrady
4644e75202 Work on boiler stats panel, hopefully fix build 2016-03-01 10:22:24 -05:00
aidancbrady
1071f2fb4d Adjusted numbers, everything is now nice and balanced 2016-02-29 00:31:19 -05:00
aidancbrady
f09010a927 Many more fixes 2016-02-28 19:11:43 -05:00
aidancbrady
7c160cc264 Interface and rendering fixes 2016-02-28 18:11:50 -05:00
aidancbrady
c0f465d0cb Boiler rendering and interface, still yet to do statistics 2016-02-28 16:44:05 -05:00
aidancbrady
2451ac4819 Completed merge 2016-02-28 12:32:36 -05:00
aidancbrady
3d43a96f91 Merge branch 'master' into development 
* master:
  Fixed Induction Matrix issue
 2016-02-28 12:31:34 -05:00
aidancbrady
9d43e4ab49 Fixed Induction Matrix issue 2016-02-28 12:31:27 -05:00
aidancbrady
155758398c Continued boiler work 2016-02-28 11:52:52 -05:00
aidancbrady
87438dcc7f Boiler work, added heat info tab, worked on polishing heat interactions among machines 2016-02-27 13:32:48 -05:00
aidancbrady
9b9ed0a4c0 Polished resistive heaters, fixed a small bug in the sound system (a bit uncleanly) 2016-02-27 01:27:26 -05:00
aidancbrady
63335a57c8 Resistive heater is just about done! 2016-02-26 20:44:21 -05:00
aidancbrady
9d55f6cc8a Lots of work on resistive heaters, still mostly unfinished 2016-02-26 19:51:37 -05:00
aidancbrady
baf3ae6f59 Update build number 2016-02-26 14:30:49 -05:00
aidancbrady
d6f6625d83 A bit of work on resistive heaters 2016-02-26 09:28:19 -05:00
aidancbrady
b3143d1abb Thermodynamic Conductors function properly, added Thermal Evaporation Plant integration with heat system 2016-02-24 20:29:50 -05:00
aidancbrady
2d972edf45 Work on boilers 2016-02-24 17:42:12 -05:00
aidancbrady
3c1496740c Tiered Gas Tanks and tiered Fluid Tanks! 2016-02-24 17:01:43 -05:00
aidancbrady
08b6490bd3 Merge branch 'development' into v9 
* development:
  Update Danish locale
  Add Danish translation
  Made text more readable, fix some mistakes
 2016-02-23 16:06:51 -05:00
Aidan
e2c2bdacf3 Merge pull request #3107 from LordSheogarad/fixRuLang 
Update rus locale
 2016-02-23 16:05:11 -05:00
aidancbrady
85b3e49800 Merge branch 'master' into development 
* master:
  Update Danish locale
  Add Danish translation
 2016-02-23 16:05:00 -05:00
Lucas Falch
3fe65bdb3a Update Danish locale 
Correct mistakes and add missing translations
 2016-02-21 23:07:18 +01:00
Lucas Falch
693e7b5e8b Add Danish translation 
Still needs some extra polishing and testing
 2016-02-21 17:43:26 +01:00
LordSheogarad
18a22800b4 Made text more readable, fix some mistakes 2016-02-21 08:07:09 +05:00
aidancbrady
c9f0ed0941 Fix forestry sapling integration 2016-02-20 11:33:45 -05:00
aidancbrady
d72f4b6181 Don't mine fluid blocks 2016-02-20 11:25:38 -05:00
aidancbrady
0f59e722e1 Use Forge handlers for jetpack/scuba tank display bar instead of item damage 2016-02-20 11:07:54 -05:00
aidancbrady
279cccaa9b Merge branch 'development' into v9 
* development:
  Fixed chunk boundary acceptor interaction
 2016-02-19 18:09:14 -05:00
aidancbrady
7e9aa46fe3 Fixed chunk boundary acceptor interaction 2016-02-19 18:09:03 -05:00
aidancbrady
1ca263813a Compressed resources now provide 8 uses instead of 10 2016-02-18 18:52:17 -05:00
aidancbrady
84da514b54 Rename Solar Evaporation Plant to Thermal Evaporation Plant 2016-02-18 18:37:38 -05:00
aidancbrady
4d60d234f3 Added recipes for boiler crafting elements, lessened copper requirements of Solar Evaporation Plant* 
*still need to rename to Thermal Evaporation Plant
 2016-02-18 18:15:39 -05:00
aidancbrady
78c0453225 Merge branch 'development' into v9 
* development:
  Fixed Digital Miner redstone slot interaction
 2016-02-15 20:28:28 -05:00