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

67 commits

Author SHA1 Message Date
malte0811 375c30d139 Some cleanup, fixed another issue along the lines of #28 2018-06-15 16:15:06 +02:00
malte0811 7008f53faa Fixed some errors and issues on dedicated servers 2018-06-13 19:09:35 +02:00
malte0811 448489b01f Add a simplified version of MultiblockTemplate to display MechMB parts in the manual 
Updated the text splitter with the changes from the manual rewrite, fixed some additional bugs
 2018-06-02 21:22:26 +02:00
malte0811 b43150d6c9 Fixed UV's for the ends of the shaft 2018-05-13 18:54:56 +02:00
malte0811 eb7f73464f Misc fixes, mostly related to sound and the "broken parts" entities 2018-05-12 19:04:38 +02:00
malte0811 b12501a86c Mech MB sound, take 1 2018-04-22 22:14:08 +02:00
malte0811 1959b93f5b Fixed some potential CME's 
IC2 feedthrough connectors properly disassemble now
 2018-04-06 18:25:46 +02:00
malte0811 b913e28271 Updated copyright to 2018 2018-02-28 21:06:33 +01:00
malte0811 8cca1b13e1 Added the commutator, the essential part for medium-power conversion 
Also, textures! Some are s**t, esp the one for the magnet ring
 2018-02-28 21:03:26 +01:00
malte0811 56fb9e3b3a Merge branch 'MC1.12' into mechStuff 2018-02-19 20:39:55 +01:00
malte0811 c3570a1273 Build 1.6-25 2018-02-19 18:11:45 +01:00
malte0811 23df4324ec Mechanical MB's disassemble properly now 
Started implementing mechanical failure (currently only for flywheels)
Changed the waveforms. This is supposed to be efficient!
 2018-02-17 20:37:53 +01:00
malte0811 8d98e30b04 More mech MB work 
This is getting somewhere!
 2018-02-13 19:23:02 +01:00
malte0811 8190a4c80e Prevent HV wires from connecting to manual breaker switches 
The wire changes are on Maven now!
 2018-02-04 17:00:31 +01:00
malte0811 6c60b4562b Merge branch 'MC1.12' into mechStuff 2018-02-01 20:56:12 +01:00
malte0811 93fb75a0b0 Adapted to the changes in wiring code for the next IE release 2018-01-30 21:59:09 +01:00
malte0811 ff3c391ac5 Added a discharge meter, a device that can measure the energy in a Marx discharge 
Also some experimental stuff for wire coils
 2018-01-28 21:30:53 +01:00
malte0811 58692ceb76 TMP commit 2018-01-01 20:07:20 +01:00
malte0811 09161bce5f Added a seven-segment display for control panels 2017-10-31 16:29:38 +01:00
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 746a5d1b57 Improved rendering of the Marx generator in the manual 
The mach converter entry isn't duplicated any more
 2017-10-21 21:15:01 +02:00
malte0811 cc14d20595 Added shaders for the Marx generator and the Jacob's ladder 2017-10-10 18:31:32 +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 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 2b3bad1149 Add signing info 2017-09-02 17:20:57 +02:00
malte0811 685a9058f6 Allow CT to remove marx recipes 2017-08-29 22:01:51 +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 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 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 92b00f199c Started adding single-component panel blocks. Very WIP 2017-07-12 20:20:11 +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 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 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 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 695679caa2 Added textures for the key+lock switch 
Renaming a key to an empty name returns it to its unnamed state
 2017-05-20 17:14:43 +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
malte0811 5165d55218 Started adding locks for panels 2017-05-18 18:13:08 +02:00
malte0811 d3cd816f0c Added some IC2 items to the Engineer's toolbox 2017-05-15 21:40:43 +02:00
malte0811 6d4c4f7276 Added a remapper to stop wire connectors from vanishing when updating 
They will be facing north though, so most of them will have to be broken and replaced
 2017-05-13 20:13:40 +02:00
malte0811 23c1afc44b Glowing components like the indicator light actuall glow in the dark now 
Some bugfixes
Complete code reformatting
 2017-05-11 16:39:20 +02:00
malte0811 01c2e58409 Updated to MC 1.11, part 1 
Compiles and runs, but probably doesn't really work yet
 2017-05-10 17:56:05 +02:00
malte0811 aca048cbee Added recipes for all panel related things 
Apart from the missing textures everything is ready for a release
 2017-05-09 17:25:03 +02:00