Aidan C. Brady
|
e38cf10ef6
|
Merge branch 'universal-wires' of https://github.com/aidancbrady/Mekanism
|
2013-12-02 11:42:21 -05:00 |
|
Aidan C. Brady
|
20d3eb42b2
|
Add needed ingot recipes & textures
|
2013-12-02 09:24:52 -05:00 |
|
Calclavia
|
07332ca245
|
Merge branch 'master' into universal-wires
Conflicts:
common/mekanism/induction/common/MekanismInduction.java
resources/assets/mekanism/lang/en_US.lang
|
2013-12-02 19:47:38 +08:00 |
|
Aidan Brady
|
e42ab62e2a
|
Begin work on copper and tin ore and ingots :)
|
2013-12-01 21:58:35 -05:00 |
|
Aidan Brady
|
83bca26455
|
Remove Maganese Alloy in hopes for better balance, fixed several GUI color issues as well as Osmium Ore darkness
|
2013-12-01 17:45:19 -05:00 |
|
Aidan Brady
|
66cba8d50b
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-12-01 14:03:06 -05:00 |
|
Aidan Brady
|
7ebd132b6e
|
Fixed teslas, merged Electrostatic Linker into Configurator
|
2013-12-01 14:03:00 -05:00 |
|
Vexatos
|
aa4610330c
|
Update de_DE.lang
|
2013-12-01 18:43:13 +01:00 |
|
Aidan Brady
|
f55d3ac874
|
Added Factory input slot distribution, configurable voice ports, fixed several bugs
|
2013-12-01 12:38:34 -05:00 |
|
Calclavia
|
c1d5e2bc60
|
Fixed non-multipart insulated wire texture
|
2013-12-01 18:05:27 +08:00 |
|
Calclavia
|
3cca65f2cd
|
Fixed non-multipart wire textures
|
2013-12-01 17:02:39 +08:00 |
|
Vexatos
|
76b7ea116d
|
Shorten the GUI stuff. I hope it is short enough for the GUIs
|
2013-12-01 09:08:11 +01:00 |
|
Calclavia
|
a674e14851
|
Fixed wire texture not loading
|
2013-12-01 14:33:30 +08:00 |
|
Calclavia
|
10bbcff077
|
Fixed Multipart wires not loading
|
2013-12-01 14:30:54 +08:00 |
|
Calclavia
|
1aabe8f7b5
|
Added insulation texture
|
2013-12-01 14:11:14 +08:00 |
|
Calclavia
|
0205d7722e
|
Readded universal wires into Mekanism Induction
|
2013-12-01 13:46:15 +08:00 |
|
Aidan Brady
|
0c618a1cf3
|
Localization & gas fixes
|
2013-11-30 11:31:18 -05:00 |
|
Vexatos
|
e2a432fe11
|
Update de_DE.lang
|
2013-11-30 08:47:03 +01:00 |
|
Aidan Brady
|
ba32a2b112
|
More localization support!
|
2013-11-30 00:43:54 -05:00 |
|
Aidan Brady
|
b224a01f39
|
Work on localization support, move around some API classes to make better compatibility
|
2013-11-30 00:28:02 -05:00 |
|
Aidan Brady
|
00b4c6f3e3
|
Rendering and transmitter performance enhancements, finish Rotary Condensentrator for the most part
|
2013-11-28 21:43:53 -05:00 |
|
Aidan Brady
|
ccae995242
|
Work on Rotary Condensentrator, fixed an issue with factories
|
2013-11-28 16:01:23 -05:00 |
|
Aidan Brady
|
98e864cd8d
|
Work on that Rotary Condensentrator!
|
2013-11-27 23:42:54 -05:00 |
|
Aidan Brady
|
419a295096
|
Work on Rotary Condensentrator, fix IC2 energy integration (mostly)
|
2013-11-27 18:17:44 -05:00 |
|
Aidan Brady
|
22fe896bcd
|
Finish multi-ID machine support
|
2013-11-27 16:17:10 -05:00 |
|
crafteverywhere
|
492e95a9c2
|
Update zh_CN.lang
|
2013-11-27 13:34:14 +08:00 |
|
Aidan Brady
|
6739d81a12
|
Miners are better for servers now. Please update!
|
2013-11-26 23:31:42 -05:00 |
|
Sakarias Longhorn
|
e08b34395e
|
French Translation
|
2013-11-27 00:52:47 +01:00 |
|
Vexatos
|
f36fde885d
|
Update de_DE.lang
|
2013-11-26 21:15:09 +01:00 |
|
Vexatos
|
08c8341eeb
|
That'll work.
|
2013-11-26 21:12:14 +01:00 |
|
Aidan Brady
|
c10ba92522
|
Connected Dynamic Glass textures :)
|
2013-11-24 19:30:52 -05:00 |
|
Aidan Brady
|
38d9bdd1d2
|
Start work on a connected texture renderer, remove old textures, fix recipes for Vaygrim’s issue (closes #481)
|
2013-11-24 18:54:11 -05:00 |
|
Aidan C. Brady
|
afae26f9b8
|
Rendering enhancements! Mechanical Pipes now function better and use the large Transmitter model.
|
2013-11-24 15:44:16 -06:00 |
|
Aidan C. Brady
|
59b945a33f
|
Fixed Model3D textures, fixed error spam on world load, fixed Digital Miner breaking blocks on top, general code cleanup
|
2013-11-24 12:12:42 -06:00 |
|
Aidan C. Brady
|
a27582971b
|
Neatened up Diversion Transporter code
|
2013-11-23 15:01:18 -05:00 |
|
Aidan
|
5b690e9bfb
|
Merge pull request #461 from pixlepix/master
Logistical Diverter
|
2013-11-23 11:44:03 -08:00 |
|
Aidan C. Brady
|
22c07254fd
|
Purification, Compressing, and Combining factories :)
|
2013-11-23 14:36:50 -05:00 |
|
Aidan Brady
|
5465102329
|
Begin work on adding more recipe types to Factories. Don’t use this build!
|
2013-11-23 11:39:27 -05:00 |
|
Aidan Brady
|
4a5df9f922
|
Fixed tesla texture
|
2013-11-23 10:42:23 -05:00 |
|
pixlepix
|
dc1743d517
|
Divertion transporter fixes, including name change
|
2013-11-23 07:28:01 -05:00 |
|
pixlepix
|
51225ba715
|
Logistical diverter texture
|
2013-11-23 07:28:01 -05:00 |
|
Aidan C. Brady
|
0adc0dc75e
|
Attempt to use my own unit system
|
2013-11-22 20:58:49 -05:00 |
|
Aidan C. Brady
|
a3d200291c
|
GUI work...
|
2013-11-22 20:39:44 -05:00 |
|
Aidan C. Brady
|
649f128d76
|
Work on textures
|
2013-11-22 20:27:27 -05:00 |
|
Aidan Brady
|
ace1365d0f
|
Aw yeah! Better GUI packets for Miner. Heading to bed guys, see ya tomorrow!
|
2013-11-21 22:30:01 -05:00 |
|
Aidan Brady
|
0e2d2917d1
|
Remove Capacitor and Empty Capacitor, fix mouses, made sorter and miner maintain configuration
|
2013-11-21 21:37:03 -05:00 |
|
Aidan C. Brady
|
1c674f4317
|
Some bounding block inventory management
|
2013-11-21 16:04:14 -05:00 |
|
Aidan Brady
|
34f300cf6f
|
Begin implementing that sexy model
don’t recommend this build for personal use
|
2013-11-20 20:28:06 -05:00 |
|
Aidan Brady
|
1f3a82c3f0
|
Miner work! Starting on actual operation algorithms.
|
2013-11-20 18:17:10 -05:00 |
|
Aidan C. Brady
|
7b3edc142e
|
GUI and networking fixes - I think the GUI is finished.
|
2013-11-20 15:15:02 -05:00 |
|
Aidan C. Brady
|
14d557cbe5
|
Some work on things, got rid of version constants, they're supposed to differ per module.
|
2013-11-20 11:01:13 -05:00 |
|
Aidan Brady
|
515cbf38c8
|
Fixes!
|
2013-11-19 22:13:35 -05:00 |
|
Aidan C. Brady
|
73bf81ceaa
|
GUI is coming together! Still need to add reset button and map button actions, but layout is there.
|
2013-11-19 19:30:56 -05:00 |
|
Aidan C. Brady
|
d02d0ceadf
|
GUI work, kinda functions, but not really
|
2013-11-19 18:56:53 -05:00 |
|
Aidan C. Brady
|
7a74fb86ba
|
More work!
|
2013-11-19 18:16:26 -05:00 |
|
Aidan C. Brady
|
86b6474f35
|
Beginning foundations of Digital Miner.
|
2013-11-19 12:13:37 -05:00 |
|
Aidan C. Brady
|
995207bcab
|
Start work on Miner, make the Bin only eject items when front side is clicked!
|
2013-11-18 15:33:14 -05:00 |
|
Anton
|
99178d8e68
|
Swap Glow and Steel names to match with other(No other changes)
|
2013-11-18 14:50:18 +03:00 |
|
Anton
|
3dc83d8296
|
Create ru_RU.lang
Not yet finished...
|
2013-11-18 14:47:40 +03:00 |
|
Aidan Brady
|
be73495110
|
…and part 2. Textures fixed.
|
2013-11-17 13:52:23 -05:00 |
|
Aidan Brady
|
80bdfc10b9
|
For some reason this is necessary. Part 1…
|
2013-11-17 13:52:10 -05:00 |
|
Aidan Brady
|
8095eb206c
|
Fix textures, hopefully fix sounds
|
2013-11-17 13:31:56 -05:00 |
|
crafteverywhere
|
fdf09fcfde
|
Update zh_CN.lang
|
2013-11-17 11:21:43 +08:00 |
|
Vexatos
|
a6e017549c
|
No more wires? :(
|
2013-11-16 21:43:02 +01:00 |
|
Aidan C. Brady
|
cc48b614ba
|
Remove wire
|
2013-11-16 12:26:49 -05:00 |
|
Aidan C. Brady
|
ed637e4eed
|
Follow Mekanism naming standards
|
2013-11-16 11:05:04 -05:00 |
|
Aidan C. Brady
|
53323279c7
|
MekanismInduction module - done!
Still need to configure the build
|
2013-11-16 10:21:37 -05:00 |
|
Aidan C. Brady
|
e6ed263aa3
|
More bin work! :D
|
2013-11-12 18:42:55 -05:00 |
|
Aidan C. Brady
|
fe0631844b
|
Some work on Bins
|
2013-11-12 16:45:48 -05:00 |
|
Aidan Brady
|
f6704dc5ea
|
Added name for bins, fixed IC2 bug, hopefully fixed ConcurrentModificationException
|
2013-11-11 17:23:14 -05:00 |
|
Aidan C. Brady
|
99f53a1322
|
Some fancy sounds and tooltips
|
2013-11-10 18:54:30 -05:00 |
|
Aidan C. Brady
|
51ad429973
|
Coming along with round robin mode :)
|
2013-11-08 11:13:51 -05:00 |
|
Aidan Brady
|
1aec33d8ec
|
Added configuration option to turn off strict input colors
|
2013-11-07 21:27:12 -05:00 |
|
Aidan Brady
|
8fdfe8d1ea
|
Items render smaller
|
2013-11-06 17:52:30 -05:00 |
|
Aidan Brady
|
1ff600b4a9
|
Added configurable restrictive input colors to all configurable machines, added some dandy sound effects
|
2013-11-04 21:11:09 -05:00 |
|
Aidan Brady
|
01a6174fdb
|
Lots of things!
|
2013-11-03 16:54:33 -05:00 |
|
Aidan Brady
|
b12d9ce65a
|
Fix swapped colors
|
2013-11-03 12:55:10 -05:00 |
|
Aidan Brady
|
c3fa020561
|
New Electric Pump model!
|
2013-11-03 12:07:23 -05:00 |
|
Aidan Brady
|
6d734c26e3
|
New models and fixes!
|
2013-11-03 11:38:36 -05:00 |
|
Aidan Brady
|
4e77e677ed
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-02 21:18:52 -04:00 |
|
Aidan Brady
|
64fe3a21ea
|
Fix typo, start work on fancy Energy Cube rendering :)
|
2013-11-02 21:07:55 -04:00 |
|
Ben Spiers
|
3c3bc631f0
|
Update en_US.lang
Manganese was misspelled
|
2013-11-02 23:19:43 +00:00 |
|
Aidan Brady
|
d1a1e3375a
|
New Metallurgic Infuser model, more efficient active state management
|
2013-11-02 19:06:56 -04:00 |
|
Aidan Brady
|
2a73dc3332
|
Gave the Solar Generator a new model
|
2013-11-02 12:00:29 -04:00 |
|
Aidan C. Brady
|
289a2ee227
|
Configurable machine output colors
|
2013-11-02 01:31:32 -04:00 |
|
Aidan Brady
|
799142198a
|
Fixed ridiculous client updates when GUI is open, fancy active sorter rendering, sorter eject sound effect :)
|
2013-11-01 23:51:10 -04:00 |
|
Aidan Brady
|
8db9c734d7
|
Sorter no longer requires energy, gave sorter new fancy model, improved the way items retreat from dead ends
|
2013-11-01 22:36:06 -04:00 |
|
Aidan C. Brady
|
91a8839203
|
Deleted Theoretical Elementizer, Weather Orb, and Steve's Stopwatch. They are no longer fitting for Mekanism's goal.
|
2013-11-01 11:33:00 -04:00 |
|
Aidan C. Brady
|
abe549bf13
|
Started some work on more filter tab information.
|
2013-10-30 23:48:50 -04:00 |
|
Aidan Brady
|
04d9b3dc68
|
Some fixes
|
2013-10-30 20:35:11 -04:00 |
|
Aidan
|
e786422f9c
|
Merge pull request #342 from Vexatos/patch-1
Update de_DE.lang
|
2013-10-30 16:13:23 -07:00 |
|
Aidan C. Brady
|
0090624a57
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-10-30 15:22:46 -04:00 |
|
Aidan C. Brady
|
656f74983f
|
Lots of progress on ejectors and GUIs
|
2013-10-30 15:22:43 -04:00 |
|
Vexatos
|
37fdc2d01b
|
Update de_DE.lang
|
2013-10-30 18:51:00 +01:00 |
|
crafteverywhere
|
47c481816e
|
Create zh_CN.lang
|
2013-10-30 18:24:55 +08:00 |
|
Aidan C. Brady
|
9496f7dfa3
|
Rewrote pathfinder, added in Restrictive Transporters, added option to have null color in filters, added default outputting filter for sorter
whoo!
|
2013-10-29 18:13:30 -04:00 |
|
Aidan C. Brady
|
5e7c01c1af
|
Client/server GUI communication logistics
|
2013-10-27 17:29:34 -04:00 |
|
Aidan C. Brady
|
f60106f0e9
|
Filter panel buttons render!
|
2013-10-27 15:00:22 -04:00 |
|
Aidan C. Brady
|
4272c4cb6d
|
Fix up custom slot render, got scroll bar working
|
2013-10-27 11:44:19 -04:00 |
|
Aidan Brady
|
340ccd1e87
|
Slightly better packet management, removed Control Panel
|
2013-10-27 00:08:39 -04:00 |
|