Aidan C. Brady
6f0cf3a166
Fixed many bugs!
...
- Asset issue with Dynamic Valve fixed
- Fixed pipes connecting to Dynamic Valves when not part of structure
- Fixed stack overflow when rendering valve fluids
- Fixed transmitter networks considering pull-based block connections as acceptor connections
- Fixed dynamic tanks maintaining a fluid type even when it has been depleted
- Fixed "clearIfNecessary()" transmitter calls not working
2015-03-04 20:01:46 -05:00
Aidan C. Brady
48b895b80a
Fixed cables screwing up over chunk boundaries, fixed positioning of title text on certain machines, added a few tooltips to Induction Cells & Providers
2015-03-04 13:38:41 -05:00
Aidan C. Brady
5747c9f904
Finished Matrix Statistics interface, need to figure out why induction cells aren't loading from NBT
2015-03-04 09:19:09 -05:00
Aidan C. Brady
a0323f9334
A bit of work on the Matrix Stats GUI, hopefully completely fixed the transmitter issue
2015-03-04 00:11:09 -05:00
Aidan C. Brady
2ed43e5328
More work. @unpairedbracket, I wasn't able to get connected textures to work with my Induction Ports - would you mind taking a look at the code?
...
The ports have an "output" and "input" mode with different textures, you can change the mode by shift-right clicking the port with a configurator. For some reason, no matter what I do, only the input texture is shown when I use the ctm system. For now I am using default block textures, but CTM textures are much preferred!
2015-03-03 16:42:50 -05:00
Aidan C. Brady
8d3dfc0c2c
Work on EIM interface
2015-03-03 13:16:58 -05:00
Aidan C. Brady
1c0fe96fed
Energized Induction Matrix work!
2015-03-02 23:05:54 -05:00
Aidan C. Brady
4aa032717e
Gave all Mekanism multiblocks the sparkle animation when formed, gave Fusion Reactor a big loud sound effect, also lowered the energy required to ignite the reactor yet again (may bump up before release)
2015-02-27 22:49:48 -06:00
Aidan C. Brady
b51aa0ee83
A few fixes, temporary x10 energy scale up to allow for higher energy production
2015-02-27 18:19:13 -06:00
Aidan C. Brady
439a734ce0
Fixed up Solar Neutron Activator NEI handler, better DT fuel texture
2015-02-27 14:06:38 -05:00
Ben Spiers
a478ad0c4f
Make statistics tab more explanatory
2015-02-27 17:33:14 +00:00
Aidan C. Brady
84ab0ecb3f
Lasers now have fancy sound effects!
2015-02-27 01:57:54 -05:00
Aidan C. Brady
9c7831d07b
Work on reactor interface a tad, work on Solar Neutron Activator
2015-02-27 00:28:46 -05:00
Aidan C. Brady
49d0a7fc4b
Work on droppers! Easiest way to get rid of leftover fluids and gasses in machine gauges.
2015-02-26 19:30:19 -05:00
Aidan C. Brady
5767bfb22e
Work on Solar Neutron Activator and its recipe system
2015-02-26 17:23:53 -05:00
Aidan C. Brady
999502a053
Half-implemented Solar Neutron Activator
2015-02-25 11:11:30 -05:00
Aidan C. Brady
955160ff45
Lithium!
2015-02-25 08:44:24 -05:00
Aidan C. Brady
62791baec7
Solar Evaporation Plant fixes
2015-02-24 14:11:26 -05:00
Aidan C. Brady
888d1bdad8
Deuterium production is complete - use heavy water electrolysis instead of centrifuge recipe
2015-02-24 10:59:03 -05:00
Aidan C. Brady
98d1a647cb
Rename Salination Plant to Solar Evaporation Plant
2015-02-23 08:08:54 -05:00
Aidan C. Brady
25df777b84
Work on fusion fuel creation mechanics, allowed Chemical Washer to accept upgrades
2015-02-17 21:27:35 -05:00
Aidan C. Brady
50f7df5f98
Merge branch 'development' into v8
...
Conflicts:
build.properties
src/main/java/mekanism/api/gas/GasNetwork.java
src/main/java/mekanism/api/transmitters/DynamicNetwork.java
src/main/java/mekanism/client/ClientTickHandler.java
src/main/java/mekanism/common/EnergyNetwork.java
src/main/java/mekanism/common/FluidNetwork.java
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/common/recipe/RecipeHandler.java
src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java
src/main/java/mekanism/generators/common/MekanismGenerators.java
src/main/java/mekanism/generators/common/block/BlockGenerator.java
2015-02-10 18:39:15 -05:00
Aidan C. Brady
d8e12ca8d2
Merge branch 'development' into v8
...
Conflicts:
src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
src/main/java/mekanism/generators/common/block/BlockGenerator.java
2015-02-10 11:38:13 -05:00
Aidan C. Brady
b1ebcd0e5e
Merged!
2015-02-10 11:33:28 -05:00
Aidan
6d5ea1f184
Merge pull request #2112 from Sakarias-Longhorn/patch-1
...
Update fr_FR.lang
2015-02-08 16:25:57 -05:00
Aidan
4ffd064c06
Merge pull request #2073 from Adaptivity/patch-4
...
Update ru_RU.lang
2015-02-08 16:25:45 -05:00
Sakarias Longhorn
cde1ab3967
Update fr_FR.lang
2015-01-29 17:24:43 +01:00
Al
a2d79d5ca5
Update pt_BR.lang
...
Fixed: "Paxel"
Minecraft vanilla:
item.leggingsCloth.name=Leather Pants
item.leggingsCloth.name=Calça de Couro (pt_BR)
2015-01-21 09:37:08 -03:00
Ben Spiers
89be8b4482
Fix using localised names for overlay textures.
2015-01-10 17:47:16 +00:00
Ben Spiers
385a1d29f6
Make a start on the boiler.
...
It's currently causing odd issues with the heat simulator and has various issues such as balance not existing yet.
Also improve the specification of a load of the multiblock generics to reduce needless casting.
2015-01-08 05:26:53 +00:00
Anton
36d3d1bdb2
Update ru_RU.lang
2015-01-05 18:22:34 +03:00
BrunoLG
7a69f96ae2
Update pt_BR.lang
2014-12-27 13:16:14 -02:00
Ben Spiers
4a404dfc78
Improve Heat mechanic, and get it rendering nicely.
...
Colour temperature algorithm adapted from http://www.tannerhelland.com/4435/convert-temperature-rgb-algorithm-code/ - thanks to Tanner Hellan for the useful post.
2014-12-20 02:09:14 +00:00
Ben Spiers
ef83acd73c
Merge branch 'development' into v8
...
Conflicts:
src/main/java/mekanism/tools/common/MekanismTools.java
2014-12-14 01:56:53 +00:00
Riku1777
350ad872e5
Update ja_JP.lang
...
miss Fixed and translate added
2014-12-02 13:34:00 +09:00
Aidan
8d7623aa65
Merge pull request #2007 from Riku17777/patch-1
...
Update ja_JP.lang
2014-12-01 17:43:59 -05:00
Riku1777
d03c419035
Update ja_JP.lang
...
I'am japanese.
JP Translate edited
hey
2014-12-02 04:07:58 +09:00
Yves
3001756562
Update fr_FR.lang
2014-12-01 09:02:36 +01:00
Mr-tanaka3
8770486d6e
Update ja_JP.lang
2014-11-23 16:45:18 +09:00
Mr-tanaka3
82d8a4f39c
Create ja_JP.lang
2014-11-23 16:36:49 +09:00
Ben Spiers
6308bf7e2f
Merge branch 'development' into 1.8
2014-11-17 22:49:39 +00:00
Yves
05fa56e87f
Update fr_FR.lang
2014-11-17 16:31:07 +01:00
Aidan C. Brady
5fd1217837
Merge branch 'development' into 1.8
2014-11-15 18:20:51 -05:00
Aidan
64dba94ea8
Merge pull request #1958 from fewizz/patch-3
...
Update ru_RU.lang
2014-11-15 18:06:07 -05:00
Yves
30cf159afd
Update fr_FR.lang
2014-11-12 09:59:33 +01:00
fewizz
7f38006c7f
Update ru_RU.lang
2014-11-11 17:44:52 +04:00
Aidan C. Brady
3abf36ef14
Fixes to config GUI, added new localization
2014-11-07 12:52:45 -05:00
Aidan C. Brady
3cfc21cc94
Merge branch 'development' into 1.8
2014-10-27 09:48:54 -04:00
Yves
775eedbc30
Update fr_FR.lang
2014-10-27 14:17:10 +01:00
Aidan Brady
0cccaaa415
Merge branch 'development' into 1.8
...
Conflicts:
src/main/java/mekanism/common/multipart/ItemGlowPanel.java
2014-10-26 15:28:28 -04:00
Aidan
284a626c43
Merge pull request #1920 from LorenzoDCC/master
...
Paxels and item descriptions!
2014-10-26 15:21:30 -04:00
Cédric
9a96ad2c16
Update FR language
2014-10-21 16:48:31 +02:00
LorenzoDCC
aef846469e
Let there be translated descriptions!
...
and paxels (I guess)
If anyone else has a better translation for the Paxel, just do it - I can't think of anything better, though.
2014-10-20 15:09:23 -02:00
LorenzoDCC
8315c1f7f5
gigi gege
...
jojoca
2014-10-16 20:04:38 -03:00
Aidan C. Brady
9bf4baab49
Merge branch 'development' into 1.8 (hopefully I didn't miss anything)
...
Conflicts:
src/main/java/mekanism/client/gui/GuiGasTank.java
src/main/java/mekanism/client/gui/GuiPortableTeleporter.java
src/main/java/mekanism/client/gui/GuiTeleporter.java
src/main/java/mekanism/common/CommonProxy.java
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/common/content/transporter/TransporterStack.java
2014-09-27 14:40:25 -04:00
[MMKP]Puyo061
6ff7ece3bc
Update ko_KR.lang
2014-09-27 20:23:50 +09:00
[MMKP]Puyo061
6899061276
Create ko_KR.lang
2014-09-26 20:55:22 +09:00
Porter Westling
2cc1b96c38
add "dump excess" option to gas tank
2014-09-23 17:15:41 -07:00
∑( ° △ °|||)
8c9b72ce14
Update zh_CN.lang
2014-09-19 02:12:45 +08:00
Ben Spiers
c12c54f9bf
Make the Laser Amplifier actually satisfactorily functional.
...
Redstone controls, minimum and maximum energy thresholds, and time delays all work concurrently, removing the need for distinct modes.
2014-09-16 02:47:54 +01:00
Ben Spiers
e84f176583
Add pulse mode to redstone control.
...
(I am going somewhere with this)
2014-09-16 02:47:54 +01:00
Aidan C. Brady
999e2de8e6
Merge branch 'development' into 1.8
...
Conflicts:
src/main/java/mekanism/client/gui/GuiPRC.java
2014-09-15 12:19:40 -04:00
Aidan
78c9cfe3f0
Merge pull request #1823 from Mrkwtkr/patch-1
...
Update zh_CN.lang
2014-09-15 12:18:27 -04:00
Ben Spiers
44d852ee9b
I accidentally a linear autominer.
...
Might make a really basic laser redirection block next - none of the refined controls of the Amplifier, none of the collection abilities of the Tractor Beam.
2014-09-15 02:11:55 +01:00
Mrkwtkr
4755a1cbcd
Update zh_CN.lang
...
Updated loacalization :)
2014-09-14 00:04:02 +08:00
jmongeon
b558b5b6d7
Fix energy gauge in Rotary Condensentrator GUI always appearing empty.
2014-09-12 02:37:21 -04:00
Ben Spiers
4ea93a6fa1
Add Connected textures to the opaque reactor blocks.
...
They're not very good at the moment, but they look ok.
2014-09-01 23:22:27 +01:00
Ben Spiers
33de5d3967
Merge branch 'experimentalCTM' into 1.8
2014-09-01 20:05:22 +01:00
Ben Spiers
6d0f8096f0
Add in support for rendering sides with overriden textures.
...
Also special facing support. Salination Plants now fully connected - the Controller texture could do with some cleaning up to improve the connected look.
2014-09-01 20:04:00 +01:00
Ben Spiers
b1a11b0ba2
Further adapt the multiblock code.
...
This will allow inter-block connected textures. I'll try and get side-specific texture overrides (eg. for the Salination Controller) working next.
2014-09-01 18:19:21 +01:00
Ben Spiers
5ae5036e62
Replace the old connected glass renderer with one adapted from Chisel.
...
I've made modifications to the original system to allow multi-meta CTM, such as between Dynamic Tanks and Dynamic Valves. This also allows texturing with effectively 5 textures, as opposed to the 47 needed previously
2014-09-01 04:03:35 +01:00
Aidan C. Brady
f71b7e1e48
Wrote some tooltips!
2014-08-31 02:09:51 -04:00
Aidan C. Brady
9224d1278a
Cleanup. Great work on the sound system overhaul, @unpairedbracket! It's perfect!
2014-08-31 02:01:11 -04:00
Ben Spiers
e83f3ee042
Merge branch 'soundsystem' into 1.8
...
@aidancbrady, I got this working, might need some more refinement but
it's pretty stable
2014-08-30 00:11:14 +01:00
Ben Spiers
9db096f9bf
Pretty satisfactory implentation now, approaching point of being able to merge into 8.0.
2014-08-29 05:15:00 +01:00
Ben Spiers
514b6962d2
Merge branch 'development' into 1.8
...
Conflicts:
src/main/java/mekanism/common/tile/TileEntitySalinationController.java
src/main/java/mekanism/common/util/MekanismUtils.java
src/main/java/mekanism/generators/common/block/BlockGenerator.java
2014-08-28 22:18:31 +01:00
Ben Spiers
e16a39912e
Configurator Overhaul. Modes now more accurately descriptive.
...
Now only configurates in mode 0, mode 1 unchanged, mode 2 only
rotates and mode 3 acts as a buildcraft wrench.
2014-08-28 19:59:50 +01:00
Ben Spiers
be3120800f
First attempt at jetpack sounds under vanilla system. Bad.
2014-08-28 02:10:09 +01:00
Ben Spiers
896c943758
Cleaning up unused stuff and 3-space tabs (?)
2014-08-27 23:55:35 +01:00
Ben Spiers
da6cbeb46d
More big sound work
2014-08-27 23:16:59 +01:00
Ben Spiers
41be14fad4
Start to re-implement sound system in vanilla sounds.
...
This will make us compatible with XU mufflers (when they're) fixed and
reduce unneccesary reinvention of wheels.
2014-08-27 20:15:33 +01:00
Ben Spiers
f8c954fbe2
Change the small transmitter model to solve the texture problem.
2014-08-18 23:23:23 +01:00
Aidan C. Brady
f0dd207c79
Fixed transmitter texture inconsistency, fixed Logistical Transporter render
2014-08-18 08:01:20 -04:00
Ben Spiers
8f9a2d31ee
Overhaul transmitter rendering, to make everything look a little nicer. Turn-offable by config in case people prefer the "classic" look.
2014-08-15 03:27:04 +01:00
Aidan C. Brady
9f91e0886e
Gave the Upgrade Management GUI a scrollbar to allow for more than 4 upgrade types to be present in a single machine
2014-08-11 15:15:09 -04:00
Aidan Brady
89bc7edc95
Started work on a scroll list GUI element
2014-08-10 00:14:12 -04:00
Ben Spiers
6f9e13a798
Add passive and steam generation Stats to reactor.
2014-08-05 02:43:03 +01:00
Ben Spiers
dffee5a8e3
Add Statistics tab to Reactor
...
Some more stats could be displayed here, regarding energy generation.
2014-08-05 01:39:17 +01:00
Aidan Brady
33970b6bf7
Updated Multiblock Controller textures, added multi-meta capability to Connected Texture Renderer
2014-08-02 11:16:14 -04:00
Aidan Brady
22db67c895
Spacing cleanup
2014-07-31 22:27:46 -04:00
Aidan Brady
da35b509fd
Creative Energy Cube now won't be drained of or receive power.
2014-07-31 19:19:03 -04:00
Aidan Brady
285423d4b1
Merge branch 'development' into 1.8
2014-07-31 18:08:12 -04:00
Ben Spiers
5f83a42fc8
Make some textures more transparent to get a better look at the fusion plasma.
2014-07-31 22:58:20 +01:00
mymagadsl
cf53322e18
Update zh_TW.lang
2014-07-30 01:24:33 +08:00
Ben Spiers
1d52a4f5a0
Add a Creative Energy Cube that's always half-full so it can sink or provide arbitrary amounts of energy.
2014-07-28 17:18:33 +01:00
Ben Spiers
f21568d5f8
Textures for Fusion Fluids
2014-07-28 17:16:56 +01:00
Aidan Brady
9696ad246c
Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8
2014-07-28 09:27:16 -04:00
Aidan Brady
1ad7fe81b9
Salination Plant now auto-forms
2014-07-28 09:27:08 -04:00
Ben Spiers
e2913e2520
Work on reactor GUI.
...
Three different screens now because there's so much information. Still need an option on the fuel screen to set the injection rate and a proper button to form the multiblock.
2014-07-28 04:24:56 +01:00
Aidan C. Brady
ce5bddbdd1
Merge branch 'development' into 1.8
...
Conflicts:
src/main/java/mekanism/common/block/BlockMachine.java
src/main/java/mekanism/common/item/ItemBlockMachine.java
src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
src/main/java/mekanism/common/tile/TileEntityPRC.java
2014-07-26 18:57:18 -04:00