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
Aidan C. Brady
aaffc3e364
Updated some imports and added textures
2014-07-26 16:45:48 -04:00
fewizz
f768dabd5f
Update ru_RU.lang
2014-07-25 12:44:54 +04:00
Aidan C. Brady
22b3097d15
Laser model! Also added some new Reactor Block assets.
2014-07-24 23:02:30 -04:00
Aidan C. Brady
5f268ae0b0
More texture updates
2014-07-24 18:30:46 -04:00
Aidan C. Brady
b992d686e8
Updated some textures, also added textures for Laser and upcoming Neutronic Centrifuge
2014-07-24 18:00:18 -04:00
Aidan C. Brady
523ec21467
Added button to remove upgrade, fixed font size. Almost done!
2014-07-22 22:16:20 -04:00
Aidan C. Brady
790cd33f2d
Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8
2014-07-22 20:37:59 -04:00
Aidan C. Brady
6470f69569
A big load of work on the new upgrade GUI
2014-07-22 20:37:53 -04:00
Ben Spiers
84daf186ca
More Reactor GUI work
2014-07-23 01:25:10 +01:00
Ben Spiers
e35a673c8b
Get lasers rendering. I've yet to proxy it off, so THIS WILL CRASH DEDICATED SERVERS
2014-07-22 03:41:30 +01:00
Ben Spiers
733da7396f
Add LiquidChlorine meta file
2014-07-22 03:41:30 +01:00
Aidan C. Brady
076c5f7377
More work!
2014-07-21 21:21:53 -04:00
Aidan C. Brady
0b8ec37164
More work on upgrade GUI, also made SimpleGui packets send new window ID to client
2014-07-21 19:15:27 -04:00
Aidan C. Brady
48183f6670
Work on the new upgrade system, specifically with GUI changes
2014-07-21 17:47:29 -04:00
Aidan C. Brady
d16483f4b1
Started work on the new upgrade system, as well as the new GUI
2014-07-21 14:57:31 -04:00
Aidan C. Brady
c1b317dcde
Added in warning for missing stacks. Onto visual Digital Miner range rendering!
2014-07-20 21:20:45 -04:00
Aidan C. Brady
de86e0b2a2
Finished off the filtering system! Also added new "fuzzy mode" to ItemStack filters in order to ignore metadata checks.
2014-07-20 20:19:01 -04:00
Aidan C. Brady
e66d4c5d93
Merge branch 'development' into 1.8
2014-07-20 15:28:29 -04:00
Aidan C. Brady
545849f187
Merge branch 'master' into development
2014-07-20 15:28:18 -04:00
Aidan C. Brady
ddc499c9fe
More work on Digital Miner filter system, also fixed a little memory leak
2014-07-20 15:27:35 -04:00
sb023612
7660a828b8
Update zh_CN.lang
2014-07-20 21:01:54 +08:00
sb023612
fe845c21d9
Update zh_CN.lang
2014-07-20 20:56:15 +08:00
Aidan C. Brady
13afad3b0d
Started work on new Digital Miner filter system
2014-07-19 19:55:34 -04:00
Ben Spiers
2e7d3a1945
Work on making it work Client-side.
2014-07-19 03:23:11 +01:00
Vexatos
ad82a76a0d
Update de_DE.lang
2014-07-18 09:57:03 +02:00
Aidan C. Brady
cfc308b042
Flames now render how I want them to! Tomorrow I add logic, such as the burning of entities and the smelting of blocks.
2014-07-18 01:34:56 -04:00
Aidan C. Brady
9469fcb51a
Started work on actual flame implementation
2014-07-17 20:06:51 -04:00
Aidan C. Brady
be7ea115b6
Some work on flamethrower sounds, also refactored sound system to allow for multiple sounds from a single object reference (to allow flamethrower and jetpack sounds to work simultaneously)
2014-07-16 16:59:45 -04:00
Ben Spiers
cb2188580e
More Laser and Reactor work. Lasers work now, and Heat Generators generate energy from incident lasers, in order to test lasers. This is probably only temporary.
2014-07-16 02:54:13 +01:00
Aidan C. Brady
a98bf8bba3
Merge branch 'development' into 1.8
2014-07-14 17:15:26 -04:00
Aidan C. Brady
146d974479
Fixed Teleporter localization, fixed balloons placing on non-solid sides, added AE processing recipes, improve tele porter efficiency
2014-07-14 17:14:32 -04:00
Aidan C. Brady
a24bd2e7ad
A bit of work on teleporter localization. There's something weird going on, though.
2014-07-14 12:57:57 -04:00
Aidan C. Brady
23b6ce5105
Merge branch 'development' into 1.8
2014-07-13 23:52:29 -04:00
Aidan C. Brady
1094475344
Fixed teleporter crash, fixed asset issue
2014-07-13 23:52:17 -04:00
Aidan C. Brady
ad0a71ee71
Merge branch 'development' into 1.8
2014-07-13 23:34:28 -04:00
Mierzen
24b15ee90f
Missed one missing tooltip (haha)
2014-07-13 22:16:46 +02:00
Mierzen
6fd14886c0
Language file changes:
...
Add missing tooltips! (Chemical oxidizer and infuser), please check!
Change "Round robin" to "Round-robin"
Make tooltips more 'square'
2014-07-13 21:54:47 +02:00
Anton
3161e916d7
Update ru_RU.lang
2014-07-13 19:58:00 +01:00
Mierzen
c893a73490
Update en_GB, add en_ZA
2014-07-13 19:57:59 +01:00
Mierzen
b650ed463d
Revert "Capitalize some language keys (yes, no and AD modes)"
...
This reverts commit 9c2582a26e
.
2014-07-13 20:56:33 +02:00
Mierzen
9c2582a26e
Capitalize some language keys (yes, no and AD modes)
2014-07-13 20:21:11 +02:00
Mierzen
7328fd4400
Remove inherited language strings from en_GB and en_ZA
2014-07-13 20:19:08 +02:00
Aidan
eecfd68798
Merge pull request #1505 from Mierzen/master
...
Update en_GB, add en_ZA
2014-07-13 13:34:39 -04:00
Anton
afe69a0f9f
Update ru_RU.lang
2014-07-13 18:41:16 +04:00
Mierzen
0872cdbf04
Update en_GB, add en_ZA
2014-07-13 13:11:00 +02:00
Aidan C. Brady
3f7de46991
Just about polished off baby skeletons, started on getting the Flamethrower to render with correct scale and orientation
2014-07-12 23:59:39 -04:00
Aidan C. Brady
9abc111ecd
Baby Skeletons, started work on Flamethrower
2014-07-12 22:34:58 -04:00
Aidan C. Brady
60b226600f
Fixes galore!
2014-07-11 00:34:05 -04:00
Aidan C. Brady
eda233f1cf
More GUI bugs!
2014-07-10 23:12:19 -04:00
Aidan C. Brady
77d3469f61
Fix a few GUI bugs
2014-07-10 23:06:35 -04:00
Aidan C. Brady
65a8633441
Gave Chemical Oxidizer and PRC upgrade systems, fixed Chemical Oxidizer and Electrolytic Separator NEI modules
2014-07-10 22:28:04 -04:00
Aidan C. Brady
12f3ef8665
Lay out the foundation for container edit modes. Also changed the way Dynamic Tank caches work - they are now much more modular and will remember their multiblock inventories on world reload.
2014-07-10 17:51:26 -04:00
Aidan C. Brady
9dc1c1d1c6
Work on a more consistent tier system. Added Reinforced Alloy, renamed Atomic Core to Atomic Alloy, and changed the recipe of the Atomic Alloy to use multiple levels of Metallurgic Infuser processing. The Reinforced Alloy is in between.
2014-07-09 23:52:01 -04:00
Aidan C. Brady
23adf9ad24
Added Salt Blocks - generates similarly to clay. Added tooltips for config GUI. Added option to regenerate ores, as this is now a thing. Also...began implementing different tiers of control circuits.
2014-07-09 22:06:36 -04:00
Aidan C. Brady
ee87d8cef5
Transmitter code cleanup - killed the now-unused merge() method and separated data handlers from ITransmitterNetwork itself. Also added new pipe textures.
2014-07-09 15:31:57 -04:00
Ben Spiers
f26c49d6b4
Add a mcmod.info for development purposes.
2014-07-07 21:23:04 +01:00
BrunoLG
9feb98953a
Update pt_BR.lang
2014-06-24 15:51:27 -03:00
Anton
1252cf7c80
Update ru_RU.lang
2014-06-21 22:07:56 +04:00
Aidan C. Brady
b7a142ba6b
Fluidic Plenisher model!
2014-06-20 20:13:20 +02:00
Aidan C. Brady
cf1469c7da
Fix weird blending issue with Dynamic Glass, gave Seismic Vibrator an on texture
2014-06-19 15:44:08 +02:00
Aidan C. Brady
fba83a3634
Fluidic Plenisher work - just about done!
2014-06-19 13:57:30 +02:00
Aidan C. Brady
90da466ca1
Started work on Fluidic Plenisher
2014-06-19 12:42:59 +02:00
Aidan C. Brady
55937cd7d4
Portable Tanks are polished as far as I can see! Also added a few missing localizations.
2014-06-19 02:34:49 +02:00
Aidan C. Brady
77207ceab1
A few GUI fixes
2014-06-18 21:18:45 +02:00
Aidan C. Brady
a3784d1fe7
More portable tank work, mainly on GUIs
2014-06-18 21:05:32 +02:00
Aidan C. Brady
adc8a9bc23
Portable Buckets...a lot more work than I thought
2014-06-18 19:42:57 +02:00
Aidan C. Brady
fd74ee5c92
Started work on Portable Tank
2014-06-18 03:01:23 +02:00
Aidan C. Brady
0528f1aace
Fix NEI offset for PRC, gave PRC a model, added specific sides for machines
2014-06-17 01:52:59 +02:00
Aidan C. Brady
fbbea1b2c9
Key bindings no longer crash, added PRC sound effect
2014-06-16 02:31:45 +02:00
Aidan C. Brady
75f09adba2
Seismic Vibrator model
2014-06-16 01:50:40 +02:00
Aidan C. Brady
f2b914e216
Loads of GUI/NEI work. Tomorrow I need to get overlays to render on GuiElement slots
2014-06-15 02:22:55 +02:00
Aidan C. Brady
3a81058cbd
Fix more transmitter render issues, also started on PRC NEI module
2014-06-14 19:31:24 +02:00
Aidan C. Brady
5c36612146
Updated NEI module to reflect new GUI changes, added PRC to RecipeHelper
2014-06-14 18:33:48 +02:00
Aidan C. Brady
70abe40b1f
Mod ID filters :)
2014-06-13 20:58:50 +02:00
Anton
0b3244c4f1
Update ru_RU.lang
2014-06-13 11:32:19 +04:00
Aidan C. Brady
517c2a7655
Re-added NEI
2014-06-13 00:26:07 +02:00
Aidan C. Brady
c8fb800c1a
Updated localization yet again, fixed a small bug
2014-06-13 00:16:02 +02:00
Aidan C. Brady
81477966ee
Fix all render issues. 1.7 is now officially more stable than 1.6 (but not stable enough)
2014-06-12 18:16:20 +02:00
Anton
2b9735d84c
Update en_US.lang
...
Correct few derps
2014-06-10 16:49:19 +04:00
Aidan C. Brady
8685664d51
Added Electric Pump energy usage config value, also fixed a few bugs with the new Gas-Burning Generator
2014-06-10 12:24:44 +02:00
Aidan C. Brady
d7fdc3a243
Greatly improved localization
2014-06-10 11:35:54 +02:00
Aidan C. Brady
85f31fb9d1
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2014-06-09 15:29:41 +02:00
Aidan C. Brady
4334690f78
Improved localization
2014-06-09 15:29:00 +02:00
Anton
dd1ea7fc3e
Update de_DE.lang
2014-06-09 09:40:28 +04:00
Anton
0cbbc5e29b
Update en_US.lang
2014-06-09 09:40:04 +04:00
Anton
f55965f53b
Update fr_FR.lang
2014-06-09 09:39:19 +04:00
Anton
f7c89dcd75
Update pl_PL.lang
2014-06-09 09:38:14 +04:00
Anton
e806004db7
Update pt_BR.lang
2014-06-09 09:37:44 +04:00
Anton
38b6765292
Update zh_CN.lang
2014-06-09 09:37:08 +04:00
Anton
60eb2944f7
Update zh_TW.lang
2014-06-09 09:35:49 +04:00
Anton
68c64cf44d
Update ru_RU.lang
...
DON'T MERGE YET
2014-06-09 09:34:57 +04:00
Aidan
96a52dd606
Merge pull request #1373 from Vexatos/patch-2
...
Update de_DE.lang
2014-06-04 03:02:19 +02:00
Aidan C. Brady
f0d3848f8a
Sounds work! Also got tick handlers set up, still have to do a few things
2014-06-03 20:57:59 +02:00
Aidan C. Brady
b365494f2e
Fixed up logger, added needed overlays
2014-06-03 08:46:03 +02:00
Aidan C. Brady
4446e14ba3
Sound system work
2014-06-02 23:57:40 +02:00
Vexatos
ea3f340cdf
Update de_DE.lang
2014-06-01 14:30:49 +02:00
Aidan C. Brady
da444327f8
A bit of work on sounds
2014-05-31 22:42:02 +02:00
Aidan Brady
6025572f15
Merge branch '1.7' into development (We're back to two branches)
...
Conflicts:
build.properties
2014-05-08 17:40:27 -04:00
Ben Spiers
ab47724473
Move the directory structure around to a more conventional one and start out on the 1.7 update.
...
3797 errors. We have a long way to go.
2014-04-20 03:44:06 +01:00