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

349 commits

Author SHA1 Message Date
Aidan C. Brady
214be2bbba Fix Electric Pump model, fix Chemical Crystalizer operation 2014-02-01 14:00:34 -05:00
Aidan C. Brady
eae1364b7e Polishing GUIs 2014-02-01 13:48:37 -05:00
Aidan C. Brady
4eeea3b0f3 More work 2014-02-01 12:58:22 -05:00
Aidan Brady
27d125dc40 Touch up on Crystalizer GUI 2014-02-01 12:09:14 -05:00
Aidan C. Brady
9df7d50159 Added sounds, GUIs now display on machines 
Need to fix up text, add detail, and start work on NEI tomorrow
 2014-02-01 00:48:01 -05:00
Aidan C. Brady
5c976f1b3c Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-01-31 16:32:25 -05:00
Aidan C. Brady
32b0e7f1cc Work on new GUIs 2014-01-31 16:32:13 -05:00
Vexatos
d4d800fa58 Update de_DE.lang 2014-01-29 09:04:09 +01:00
Aidan C. Brady
c4e679280b Chemical Crystalizer base tile code 2014-01-28 19:29:29 -05:00
Aidan C. Brady
72e10a8162 Just about finished base Chemical Washer code 2014-01-28 16:19:07 -05:00
Aidan C. Brady
b180f4e968 Started on new machines 2014-01-26 17:12:03 -05:00
Vexatos
1328e19436 Update de_DE.lang 2014-01-26 07:56:31 +01:00
Aidan Brady
c1aadd2bd0 NEI localization stuff 2014-01-25 16:29:36 -05:00
Vexatos
cb38414abc Update de_DE.lang 2014-01-25 06:45:52 +01:00
Aidan Brady
f80341ca9d Clean Slurry textures 2014-01-21 18:19:39 -05:00
Aidan C. Brady
0a0e329223 Ore gasses! For use in T4 (5x) ore processing. 2014-01-21 17:58:00 -05:00
Aidan C. Brady
6f723f64bd Crystals! Currently useless. 2014-01-21 11:28:43 -05:00
Aidan C. Brady
57744e791d Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-01-19 20:32:22 -05:00
Aidan C. Brady
52aa704a74 Add in textures for some future stuff 2014-01-19 20:32:16 -05:00
Aidan
3bcccbe1ee Merge pull request #877 from Mierzen/development 
Update textures to be more understandable
 2014-01-19 15:25:33 -08:00
Mierzen
8aa3f94a9c Update textures to be more understandable 
Advanced Solar Generator:  Removed the gray parts at the bottom, leaving
only one red "output port".
Wind Turbine:  Added an "output port", since it did not have one.

I also changed the red block to a green one (now it looks similar to the
green energy inside the universal cables)
 2014-01-19 18:48:04 +02:00
Aidan C. Brady
93b7321dea T3 ore processing now uses Hydrogen Chloride 2014-01-18 15:10:17 -05:00
Aidan C. Brady
31fbf5ee14 Added clay recipe, thanks @VapourDrive! 2014-01-18 11:41:41 -05:00
Aidan C. Brady
0314b11edb Hopefully fix some things 2014-01-17 20:38:05 -05:00
Mierzen
b9018c8dce Re-update Elec. Seperator and Sawmill tooltip 
Changed my previous edit:  made the multiline tooltip display better ("more square")
 2014-01-17 17:29:00 +02:00
Aidan C. Brady
61306fd664 More work on things 2014-01-17 09:17:38 -05:00
Aidan Brady
db029274f7 Fix up GUIs 2014-01-16 21:31:30 -05:00
Aidan Brady
175f3e8646 Got GUIs working with new fanciness 2014-01-16 21:26:40 -05:00
Aidan Brady
4fb335b7d3 Lay down framework for gas-based advanced machines 2014-01-16 19:00:53 -05:00
Aidan Brady
6d366c0475 Brine Buckets! 2014-01-16 16:47:35 -05:00
Aidan Brady
4d29a57a27 A few fixes, new textures 2014-01-16 16:31:05 -05:00
Aidan C. Brady
3e6a017979 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-01-16 16:04:18 -05:00
Aidan C. Brady
d3ae5be20b Work on things! 2014-01-16 16:03:05 -05:00
Aidan
aaf1ea45d6 Merge pull request #841 from Vexatos/patch-1 
Update de_DE.lang
 2014-01-16 05:22:23 -08:00
Mierzen
7399560de3 Multi-line tooltips 
Change Electorlytic Seperator and Precision Sawmill tooltips to be multi-line.
 2014-01-16 11:01:40 +02:00
Vexatos
411713e60f Update de_DE.lang 2014-01-16 07:57:20 +01:00
Aidan Brady
053b6f34f6 Salination Controller GUI handler because I’m nice 2014-01-15 23:03:40 -05:00
Aidan C. Brady
ab58f76d6b Tooltips! 2014-01-15 07:45:55 -05:00
Aidan C. Brady
ae5fe1cfbf Just about finished Salination Plant multiblock stuff 2014-01-14 21:29:46 -05:00
Aidan C. Brady
98f3f544cd More salivation plant work 2014-01-14 18:30:26 -05:00
Aidan C. Brady
56db9737f6 Work on multiblock algorithm 2014-01-14 11:28:09 -05:00
Aidan C. Brady
83ee208fb7 Added a few cool textures, neatened up Salination Tank structure code 2014-01-13 23:53:56 -05:00
Aidan Brady
71cfd3cd84 Better textures, sounds for Chemical Infuser, Chemical Oxidizer & Precision Sawmill, sounds now fade in 2014-01-13 22:27:47 -05:00
Aidan C. Brady
b82f96d19b Fixed a few textures, added Salt, added NEI recipe handler for Precision Sawmill 2014-01-13 15:41:23 -05:00
Aidan C. Brady
301691729f Fixed Cardboard side texture 2014-01-13 15:05:26 -05:00
Aidan C. Brady
dd8e77d918 Precision Sawmill textures 2014-01-13 12:22:23 -05:00
Aidan C. Brady
5dfee9ec7a Precision Sawmill and overall Chance Machine framework GUI & Container 2014-01-13 00:06:13 -05:00
Aidan C. Brady
19b36e901b Work on Precision Sawmill, added Sawdust, finished ChanceMachine tile and recipe foundation 2014-01-12 23:55:42 -05:00
Aidan C. Brady
ebdbdbefe3 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-01-12 21:23:41 -05:00
Aidan C. Brady
89a70f4444 Cardboard Boxes. Yep :) 2014-01-12 21:23:34 -05:00
Anton
3e0c37a079 Update ru_RU.lang 
Adapted !n for ru_RU.lang
 2014-01-12 15:21:21 +03:00
Anton
1af883a22b Update ru_RU.lang 2014-01-12 09:40:44 +03:00
Ben Spiers
6fa8cebb3a Make a start on the Salination plant. Primitive so far but the multiblock system just about works. 2014-01-11 23:35:39 +00:00
Aidan
76a131c8aa Merge pull request #811 from Vexatos/patch-1 
Update de_DE.lang
 2014-01-11 08:50:24 -08:00
Aidan Brady
70d3140296 Config property for displaying different energy units 2014-01-11 11:49:27 -05:00
Vexatos
3fecbb8b2b Update de_DE.lang 2014-01-11 17:33:31 +01:00
Aidan C. Brady
dc69809d15 Merge branches 'development' and 'development' of https://github.com/aidancbrady/Mekanism into development 2014-01-10 23:17:31 -05:00
Aidan C. Brady
5a477fd62d Colorful! 2014-01-10 23:17:09 -05:00
Ben Spiers
f87c27aeee Make the standard power bar a GuiElement. I think it might be good to move towards a more modular gui system. Have more stuff done in code and less in graphics. 2014-01-11 02:50:02 +00:00
Aidan C. Brady
9393ddcbc6 Cooler energy info tab 2014-01-10 17:45:59 -05:00
Aidan C. Brady
0b98b085d3 Add fancy energy info tabs, fix a few things, bump up both energy usage and generation on some machines/generators 2014-01-10 17:42:53 -05:00
Aidan C. Brady
01f3569acd Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-01-10 16:56:14 -05:00
Aidan Brady
34cda86ec8 Start work on something :) 2014-01-10 16:54:26 -05:00
Aidan C. Brady
e2cdf625c1 New Hydrogen Chloride texture 2014-01-10 15:27:12 -05:00
Aidan C. Brady
836dd3c22a Electrolytic Separator NEI plugin 2014-01-10 12:58:05 -05:00
Aidan C. Brady
6eb43d11d7 Just about finished Rotary Condensentrator NEI support 2014-01-10 08:12:47 -05:00
Aidan Brady
531bfe85ee Add base class for Rotary Condensentrator NEI plugin as well 2014-01-09 20:52:19 -05:00
Aidan Brady
f7eb278276 Chemical Infuser recipe handler! 2014-01-09 20:47:06 -05:00
Aidan Brady
df2ea3155a Updated GUI textures to fix copy alpha screw up 2014-01-09 18:47:38 -05:00
Ben Spiers
333afdc79b Remove the old transmitter renderer, enable the new one to render in hand and inventory 2014-01-07 16:22:59 +00:00
Aidan Brady
2cad51412d Localization for new cables 2014-01-07 07:17:26 -05:00
Aidan Brady
6d37ec3dd8 Add more missing locales 2014-01-05 16:03:31 -05:00
Aidan Brady
8ba9aefcda Add missing localization 2014-01-05 15:15:25 -05:00
Ben Spiers
4b1adf76bc Stop FML complaining about item conflicts, fix my translation. 2014-01-05 17:53:10 +00:00
Ben Spiers
0193659c74 Switch the injection chamber to use HCl, up the difficulty of obtaining sulphur dust to prepare for sulphuric acid's use in top-tier processing. 2014-01-05 16:22:41 +00:00
Ben Spiers
7109e84907 Gui element stuff. 2014-01-05 16:22:41 +00:00
Aidan C. Brady
55a0e39c07 Digital Miner inverse mode 2014-01-04 11:41:09 -05:00
Anton
12c96465b0 Update ru_RU.lang 2014-01-03 11:33:34 +03:00
Aidan C. Brady
c0dba3c366 Fixed GUI issue, fixed particles 2014-01-03 00:43:55 -05:00
Aidan Brady
2cf27c698d Added Compressed Redstone as an efficient means of obtaining redstone infuse 2014-01-02 23:46:23 -05:00
Aidan Brady
cb0b6f4a83 New, awesome Electrolytic Separator GUI :) 2014-01-02 23:34:52 -05:00
Aidan Brady
99ca8f6624 Cleanups and fixes from the electrolytic separator update 2014-01-02 22:30:23 -05:00
Ben Spiers
f84bc43be1 Move separator into mek core, let IDEA optimise imports. Hope I didn't screw anything up too badly. 2014-01-03 02:09:21 +00:00
Ben Spiers
87a95e0732 Add Chlorine, do more E. Separator work, including temporary lava/brine substitute. I think it's pretty much finished for now, though maybe it could do with a new model. 2014-01-03 00:28:34 +00:00
Aidan
c8d765bde0 Merge pull request #772 from Vexatos/patch-1 
Update de_DE.lang
 2014-01-02 10:19:44 -08:00
Anton
30e8c19846 Update ru_RU.lang 2014-01-02 12:14:45 +03:00
Vexatos
701f20615e Update de_DE.lang 2014-01-02 08:30:51 +01:00
Aidan C. Brady
ea76a68112 Fix factory GUI support with sulfuric acid 2014-01-01 19:26:20 -05:00
Aidan C. Brady
67d38fd179 Removed Chemical Combiner (hopefully all references) 2014-01-01 16:21:55 -05:00
Ben Spiers
a07ca18997 Change to Infuser for final stage of the contact process 2014-01-01 19:55:18 +00:00
Anton
13a322d6ee Update ru_RU.lang 
Tooltips translated.
 2014-01-01 17:45:43 +03:00
Aidan
4785182513 Merge pull request #770 from Vexatos/patch-1 
Update de_DE.lang
 2014-01-01 00:23:34 -08:00
Vexatos
0703bb66d5 Update de_DE.lang 2014-01-01 08:56:34 +01:00
Anton
f9dce4d5e5 Update ru_RU.lang 2014-01-01 10:53:50 +03:00
Aidan C. Brady
c1e40be9ad Added Chemical Infuser model, still need to add dynamic rendering (shouldn't be too hard since I already have Chemical Oxidizer framework complete 2013-12-31 22:54:39 -05:00
Ben Spiers
544d96f3bc Get most of the contact process stuff working with WIP textures and such. .langs will need updating again for new things (Chemical Combiner is a provisional name though, for the time being.) 2014-01-01 03:03:23 +00:00
Ben Spiers
571ad3944f Sulphur dioxide and sulphur trioxide 2013-12-31 22:24:46 +00:00
Aidan
69032ed2a0 Merge pull request #768 from Vexatos/patch-1 
Update de_DE.lang
 2013-12-31 13:51:21 -08:00
Aidan C. Brady
2dc6a35d16 Fix a GUI bug, fixed gas tanks not loading properly, fix a few culling issues with Chemical Oxidizer, made gas render visually in Chemical Oxidizer 2013-12-31 16:38:40 -05:00
Vexatos
5f3dca8baf Update de_DE.lang 2013-12-31 22:05:39 +01:00