tilera/IndustrialWires
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
129 commits 14 branches 0 tags 2.9 MiB
Commit graph

93 commits

Author SHA1 Message Date
malte0811 f4884d23ba Build 1.6-21 
Updated README.md+screenshot
Fixed the Marx generator not charging properly off an EU supply
Fixed the IE version detection. Stupid Java optimized out the field access to the version String since it's static final
 2017-10-22 20:02:41 +02:00
malte0811 1b9bd041b0 Minor cleanup of the Marx generator disassembly code 2017-10-20 18:59:27 +02:00
malte0811 a4de0c800d Fixed issues with block breaking (Marx generator) 2017-10-10 18:42:44 +02:00
malte0811 d3b937433d Merge branch 'shaders' into MC1.12 2017-10-10 18:34:22 +02:00
malte0811 cc14d20595 Added shaders for the Marx generator and the Jacob's ladder 2017-10-10 18:31:32 +02:00
malte0811 9f6407e300 New ear damage distance formula. Manual and reality should match this time! 2017-10-09 20:31:01 +02:00
malte0811 f33650280e Fixed a race condition with Marx generator discharges (probably, as usual with race conditions) 2017-10-08 18:39:15 +02:00
malte0811 ab77d28bc9 Fixed invisible wires on dedicated servers 2017-10-07 18:51:28 +02:00
malte0811 e9449440fd Build 1.6-20 
Fix some Marx crashes on dedicated servers
Fix wires attached to MG's sometimes not rendering
Fix issues with tinnitus when setting volume to 0
 2017-09-15 20:03:23 +02:00
malte0811 67562ef296 Remove TE's that don't need to tick from the ticking TE list 
Use IE uranium if IC2 isn't installed
 2017-09-13 21:32:19 +02:00
malte0811 d5d0dca298 Replace Albedo by Mirage 
Fix orientation of the Marx spark gap render
Fix lighting differences between mirrored and normal Marx gens
 2017-09-06 21:18:59 +02:00
malte0811 c8c2b5bf88 Lots of small fixes for the Marx generator 
Includes mirrored models. TODO: Recalculate normals for default models to fix lighting differences
 2017-09-04 22:04:53 +02:00
malte0811 8d4c0fcad2 Merge branch 'marx' into MC1.12 2017-09-04 17:42:50 +02:00
malte0811 ac7d36b5e7 Add documentation on the Marx generator 
Add a command to get/set/regenerate the marx energy factor
 2017-09-03 20:48:10 +02:00
malte0811 bc1ebc9fa5 Add JEI support for the Marx generator 2017-08-29 21:31:22 +02:00
malte0811 96aa3ec96a Add CraftTweaker support for the Marx generator 2017-08-27 22:45:52 +02:00
malte0811 e200185235 Add a separate sound for Marx misfirings 
Add a texture for the tinnitus potion effect
 2017-08-27 20:27:29 +02:00
malte0811 840869cd08 Fix some bugs&crashes when IC2 isn't installed 
Some general cleanup
 2017-08-23 22:30:24 +02:00
malte0811 ccc3c7ab12 IC2 is an optional dependency now, probably still buggy 
Fix the TE names
 2017-08-22 18:33:05 +02:00
malte0811 2f609e9026 Add a second RS channel for each voltage signal to allow precise control 2017-08-16 21:15:26 +02:00
malte0811 505464c002 Discharges can fail if the total voltage is too low 
Added Albedo compat for the marx generator
 2017-08-15 21:37:53 +02:00
malte0811 2b2f5ca6c1 Replace the ore-specific energy values with one global constant, to make it possible to determine the constant with cheap ores 
Fix a crash when interacting with the top/bottom side of a HV capacitor
 2017-08-14 21:56:44 +02:00
malte0811 fdacf4129f Don't interact with other TE's in onChunkUnload, closes #12 
(Ported from 1.11)
 2017-08-14 17:38:33 +02:00
malte0811 c18d94899a Change the structure of the Marx generator to not include IC2 blocks 
Finish up the texture/model
Fix some bugs where the energy storage goes negative and starts charging the marx to -Infinity V
 2017-08-13 18:46:46 +02:00
malte0811 5667768420 Merge branch 'MC1.12' into marx 
# Conflicts:
#	build.gradle
#	src/main/java/malte0811/industrialWires/IndustrialWires.java
#	src/main/java/malte0811/industrialWires/blocks/controlpanel/TileEntityPanel.java
#	src/main/java/malte0811/industrialWires/blocks/hv/BlockJacobsLadder.java
#	src/main/java/malte0811/industrialWires/blocks/hv/TileEntityJacobsLadder.java
#	src/main/java/malte0811/industrialWires/client/ClientProxy.java
#	src/main/java/malte0811/industrialWires/client/render/TileRenderJacobsLadder.java
#	src/main/java/malte0811/industrialWires/controlpanel/PanelComponent.java
 2017-08-07 22:03:07 +02:00
malte0811 c53b09b6ce Merge branch 'MC1.12' into marx 
# Conflicts:
#	build.gradle
#	src/main/java/malte0811/industrialWires/IndustrialWires.java
#	src/main/java/malte0811/industrialWires/blocks/controlpanel/TileEntityPanel.java
#	src/main/java/malte0811/industrialWires/blocks/hv/BlockJacobsLadder.java
#	src/main/java/malte0811/industrialWires/blocks/hv/TileEntityJacobsLadder.java
#	src/main/java/malte0811/industrialWires/client/ClientProxy.java
#	src/main/java/malte0811/industrialWires/client/render/TileRenderJacobsLadder.java
#	src/main/java/malte0811/industrialWires/controlpanel/PanelComponent.java
 2017-08-06 18:15:08 +02:00
malte0811 5911b6a49e Build 1.5-15 
Fixed an issue with control panels on servers
 2017-07-13 18:13:06 +02:00
malte0811 1def161870 Single-component panels are complete, just docs and probably bugfixes to do 2017-07-13 09:23:41 +02:00
malte0811 92b00f199c Started adding single-component panel blocks. Very WIP 2017-07-12 20:20:11 +02:00
malte0811 107196ed1b One more fix for connecting panels using connectors after the panel and the controller have been placed 2017-07-10 20:50:16 +02:00
malte0811 6f6edab7b1 IW's items show up in the creative search now 
Coil length crafting now leaves the correct coil behind if the length is over the maximum
 2017-07-10 20:30:18 +02:00
malte0811 9ee44021bc Update to 1.12: Recipes 
The recipe book is quite inconsistent about NBT...
 2017-07-10 17:59:43 +02:00
malte0811 d0472b45b9 Update to 1.12: Everything except recipes done. Probably quite buggy 2017-07-09 18:10:06 +02:00
malte0811 292c150466 Possibly improved transformation performance, closes #10 2017-07-03 21:08:39 +02:00
malte0811 f8f2de930e Fixed panels not updating when a connection via panel connectors is broken or placed 2017-07-03 20:38:31 +02:00
malte0811 b716c23e3d Added a way to create tilted panels in-game (no recipe yet) 
Panels are no longer created from machine casings, but from unfinished panels
 2017-06-30 21:04:43 +02:00
malte0811 15674f7ae3 Added tilted panels. Currently they can only be created by editing the panels NBT data 2017-06-28 21:41:50 +02:00
malte0811 cbac269e04 Updated mappings to match the ones used by IE 2017-06-25 18:34:10 +02:00
malte0811 d68eb801c3 Started implementing ore processing 2017-06-25 18:00:48 +02:00
malte0811 9ae4bad8b6 Misc Marx stuff: 
-The bottom cap charges faster now
-Tinnitus can be replaced by damage or nausea in the config file
-If the first cap is charged higher than the charging voltage it will only be discharged if the yellow signal is 0
-Improved handling of low stored power
 2017-06-23 17:40:49 +02:00
malte0811 5f8ef84e0f Merge branch 'MC1.11' into marx 2017-06-23 17:33:13 +02:00
malte0811 e9a2ade95a Allowed multiple components on the same panel network to modify the same RS signal 
Cleaned up RS output code for panel components
Removed IC2's maven from build.gradle, since it is currently offline
 2017-06-17 17:22:44 +02:00
malte0811 143311aecf Effects of Marx discharges on entities: 
Damage for thos close to the discharge, tinnitus for those further out
Also added a nice bang for discharges (it is from a cap bank rather than a Marx though)
 2017-06-16 22:04:30 +02:00
malte0811 d65621a0b5 Redstone control, other misc Marx generator details 2017-06-09 11:37:23 +02:00
malte0811 206c1170f1 Merge branch 'MC1.11' into marx 2017-06-05 17:23:18 +02:00
malte0811 963755af78 Wire connections and bounding boxes for the Marx generator 
Some misc stuff
 2017-06-03 21:06:25 +02:00
malte0811 d4bed0d324 Added a render for the Marx generator 2017-06-02 17:57:17 +02:00
malte0811 5a80b2626b Marx generator. It forms and breaks 
Models for mirrored marx generators are broken
The IC2 cables drop as items due to missing IC2 API methods
 2017-06-01 11:44:07 +02:00
malte0811 b9f5a8a9f8 Added (analog) panel meters 
Fixed locks breaking the model cache
Ported the fix for #7
 2017-05-27 17:02:18 +02:00
malte0811 6a2ce4685b Finished up the lock switch, just missing textures now 
Added a recipe to copy settings from one panel component to another
Some internal changes
 2017-05-19 17:45:30 +02:00