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
Aidan C. Brady
a277b6e266
Fixed a few bugs and reverted name changes of Sulfuric Acid in liquid/gas form. Even though it's not scientifically correct, it fits better with the Mekanism theme and is easier to understand.
2013-12-31 15:23:04 -05:00
Aidan C. Brady
750bb2dab7
Rename Oxidation Chamber to Chemical Oxidizer and added model, will explain why below. This means a minor lang update @crafteverywhere, @VeryBigBro, @Vexatos
...
Notice that all Mekanism machines that perform similar tasks have a similar ending word; for example, the Metallurgic Infuser infuses alloys into ingots, and the Chemical Infuser infuses chemicals into other chemicals. Every ore processing machine has "Chamber" as the final word, and as this is not directly linked to ore processing, it would be best to move the "Oxidation" side of the machine to the end. Furthermore, for this chemical line, I am trying to keep "Chemical" as the first word in each machine title: Chemical Infuser, Chemical Oxidizer, Chemical Injection Chamber, etc. Hope that makes sense!
2013-12-31 15:07:09 -05:00
Ben Spiers
be33883a53
Merge pull request #762 from VeryBigBro/patch-3
...
Update ru_RU.lang
2013-12-30 05:15:12 -08:00
Anton
5bf4b55550
Update ru_RU.lang
2013-12-30 14:08:21 +03:00
Vexatos
2d260d1b72
Update de_DE.lang
2013-12-30 09:16:38 +01:00
Ben Spiers
ebc1cce01d
Update names of some things.
...
Translations will need updating, @Vexatos, @VeryBigBro, @crafteverywhere
2013-12-30 03:03:57 +00:00
Ben Spiers
48b3e48ed3
Re-enable indev machines for now, change Chemical Formulator to Oxidation Chamber, introduce sulphur dust.
2013-12-30 02:59:45 +00:00
Ben Spiers
c3d3c789bb
British English localisation
2013-12-29 20:45:36 +00:00
Aidan Brady
28a63cc9d2
More proxy fixes, chemical injection chamber sound
2013-12-24 17:17:00 -05:00
Aidan C. Brady
d63628bebc
Merge branch 'master' into development
...
Conflicts:
common/mekanism/client/ClientProxy.java
common/mekanism/client/HolidayManager.java
common/mekanism/client/sound/SoundHandler.java
common/mekanism/client/sound/TileSound.java
2013-12-24 14:44:17 -05:00
Aidan Brady
84f4eaee76
Christmas fun :)
2013-12-24 14:38:12 -05:00
Aidan C. Brady
1477b6ba7c
Finished shard textures
2013-12-24 11:40:19 -05:00
Aidan C. Brady
4cfee657a0
Begin work on shard textures, still have a few to go
2013-12-24 11:17:52 -05:00
Aidan C. Brady
a41760affd
Chemical Injection Chamber initial work
2013-12-24 00:23:30 -05:00
Anton
5650ae38d1
Update ru_RU.lang
2013-12-22 14:39:34 +03:00
Anton
e163d5e6bd
Update ru_RU.lang
...
some work
2013-12-21 19:54:29 +03:00
Aidan Brady
f2d202d90f
Work on transporters
2013-12-20 17:46:24 -05:00
Aidan Brady
40e2d3b7fc
Bump version, work on multipart transporters
2013-12-20 16:47:09 -05:00
Aidan Brady
510debc0fb
Kill induction module and start on balloons :)
2013-12-20 01:05:41 -05:00
Aidan Brady
6b5f8833f0
Have Logistical Transporters use interfaces instead of directly referencing classes; should make multipart support easy
2013-12-19 18:21:12 -05:00
Ben Spiers
52939f763b
Large Model variants. Fluid contents rendering still needs work but that's not using an obj model. It could potentially; it would be a lot cleaner in code but would mean a *lot* of blender work.
2013-12-18 18:42:05 +00:00
Ben Spiers
8199408e75
Side-specific changeable models. They don't behave differently yet but that should be possible now without too much trouble.
2013-12-17 20:02:29 +00:00
Ben Spiers
3a97630f55
Add new shapes to small model.
2013-12-17 02:21:30 +00:00
Aidan Brady
d21ef524a0
Work on jetpacks/scuba stuff
2013-12-15 16:07:30 -05:00
Aidan Brady
8057d605a1
Merge branch 'master' into development
2013-12-15 14:19:57 -05:00
crafteverywhere
f673244293
Update zh_CN.lang
2013-12-15 20:19:09 +08:00
Aidan Brady
345aecb4db
Merge branch 'master' into development
2013-12-14 17:58:13 -05:00
Aidan C. Brady
1e1eabfd5e
Even more localization, fixed a few tiny bugs
2013-12-14 15:13:12 -05:00
Vexatos
fc0a611f93
Update de_DE.lang
2013-12-13 19:50:48 +01:00
Aidan Brady
11c7efd8fc
Merge branch 'api-change' into multipart-experimental-new
2013-12-12 22:36:00 -05:00
Aidan Brady
2d5b633168
Work on stuff
2013-12-12 20:35:37 -05:00
Aidan Brady
43d3050b40
Work on Chemical Infuser
2013-12-12 18:33:56 -05:00
Ben Spiers
98c8068a0f
Get Mechanical Pipe rendering working a bit better.
2013-12-12 20:23:03 +00:00
Aidan Brady
31f8566a1f
Merge branch 'master' into multipart-experimental-new
...
Conflicts:
common/mekanism/common/Mekanism.java
2013-12-12 08:43:21 -05:00
Aidan Brady
faa127ddd8
Add textures for Sulfuric Gas & Sulfuric Acid
2013-12-11 20:46:39 -05:00
Aidan Brady
5a241ce8ee
Work on GUIs
2013-12-11 20:24:37 -05:00
Aidan Brady
2d626f2279
Work on Chemical Infuser & Chemical Formulator recipe system
2013-12-11 17:08:15 -05:00
Aidan C. Brady
7e48fa2743
Work on container code
2013-12-11 16:34:54 -05:00
Aidan C. Brady
a4e8158448
Add GUIs for T3 ore processing machinery
2013-12-10 18:51:16 -05:00
Aidan Brady
250ddadcf0
Dictionary! :)
2013-12-09 20:52:49 -05:00
Aidan Brady
3c4d776e24
Added lead ore processing
2013-12-09 18:30:50 -05:00
Vexatos
461e2886ab
Typo fix. Let's hope is was a typo.
...
Let's hope is was a typo.
2013-12-09 19:23:03 +01:00
Vexatos
02fcac8967
Loads of work done. (Updated de_DE.lang)
...
Yes, "Minierer" is a German word.
2013-12-09 19:22:05 +01:00
Aidan Brady
916859c21d
Added description text to machines
2013-12-06 20:03:25 -05:00
Aidan C. Brady
cb9900bbc7
Work on gas masks/scuba gear stuff
2013-12-06 15:26:44 -05:00
Aidan Brady
d36409f4b0
Merge branch 'master' into multipart-experimental-new
...
Conflicts:
common/mekanism/client/model/ModelJetpack.java
common/mekanism/client/render/ModelCustomArmor.java
common/mekanism/common/Mekanism.java
common/mekanism/common/item/ItemJetpack.java
common/mekanism/common/tileentity/TileEntityUniversalCable.java
common/mekanism/induction/client/render/RenderWire.java
common/mekanism/induction/common/tileentity/TileEntityMultimeter.java
common/mekanism/induction/common/tileentity/TileEntityWire.java
common/mekanism/induction/common/wire/PartUniversalConductor.java
common/mekanism/induction/common/wire/PartWire.java
2013-12-05 22:37:27 -05:00
Aidan Brady
c3a985f273
Kill off wires for the last time, fix up jetpacks
2013-12-05 21:10:15 -05:00
Aidan C. Brady
a204df448f
Work on jetpacks
2013-12-05 15:50:38 -05:00
Aidan Brady
38dda1d18e
Fix name, add a few more particle effects
2013-12-04 20:01:27 -05:00
Aidan Brady
bf9d48d86f
Work on jetpacks - specifically networking fixes and sounds!
2013-12-04 16:53:58 -05:00
Vexatos
538fdbcce4
Couldn't you have done this yourself? Nevermind...
2013-12-04 15:31:31 +01:00
Aidan Brady
7182d07cbd
Bugfixes and the beginnings of jetpacks!
2013-12-03 23:36:06 -05:00
Aidan Brady
1cfdd805f3
Work on jetpack
2013-12-03 21:49:12 -05:00
Aidan Brady
8f4ac31871
Minor cleanup
2013-12-03 17:46:48 -05:00
Aidan Brady
afe85f9215
Fix some pesky bugs and crashes
2013-12-03 16:56:03 -05:00
Aidan C. Brady
ef8b6c1c78
Fix gas render in mech pipe
2013-12-03 11:24:23 -05:00
Vexatos
278b46a8dd
Update de_DE.lang
2013-12-03 15:39:26 +01:00
Aidan Brady
934d537230
Fix a few issues
2013-12-03 07:18:40 -05:00
Vexatos
c0b57017df
Update de_DE.lang
2013-12-03 07:48:00 +01:00
Aidan Brady
a3fa18cb80
Remove superconductor, make Heat Gen cheaper
2013-12-02 22:35:46 -05:00
Aidan Brady
5d8e21b776
Merge branch 'master' of https://github.com/aidancbrady/Mekanism into multipart-experimental-new
...
Conflicts:
common/mekanism/api/gas/GasNetwork.java
common/mekanism/api/gas/GasTransmission.java
common/mekanism/api/transmitters/DynamicNetwork.java
common/mekanism/client/EnergyClientUpdate.java
common/mekanism/client/FluidClientUpdate.java
common/mekanism/client/GasClientUpdate.java
common/mekanism/client/render/tileentity/RenderUniversalCable.java
common/mekanism/common/EnergyNetwork.java
common/mekanism/common/FluidNetwork.java
common/mekanism/common/InventoryNetwork.java
common/mekanism/common/Mekanism.java
common/mekanism/common/item/ItemConfigurator.java
common/mekanism/common/tileentity/TileEntityLogisticalTransporter.java
common/mekanism/common/tileentity/TileEntityMechanicalPipe.java
common/mekanism/common/tileentity/TileEntityPressurizedTube.java
common/mekanism/common/tileentity/TileEntityTransmitter.java
common/mekanism/common/tileentity/TileEntityUniversalCable.java
common/mekanism/common/util/CableUtils.java
resources/assets/mekanism/textures/blocks/LiquidEnergy.png.mcmeta
2013-12-02 21:45:40 -05:00
Aidan Brady
30237b34ac
Delete old textures, add Copper and Tin blocks
2013-12-02 20:52:44 -05:00
Aidan C. Brady
57caab2062
Wire fixes
2013-12-02 17:04:41 -05:00
Vexatos
f5f9dca4ee
Update de_DE.lang
2013-12-02 19:08:17 +01:00
Aidan C. Brady
5c2c8e15cb
Add in necessary models
2013-12-02 12:41:00 -05:00
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
