Commit graph

56 commits

Author SHA1 Message Date
malte0811
1cef97f260 Major cleanup of the redstone side of control panels. Not done yet. 2018-07-30 20:30:57 +02:00
malte0811
3d2865aa93 Basic separated energy inputs/outputs for MechMB's 2018-06-16 19:15:15 +02:00
malte0811
316cc2ab78 Added a speedometer for automatic speed control
Fixed variacs and sliders on dedicated panels not working on world reload
2018-03-02 22:05:27 +01:00
malte0811
b913e28271 Updated copyright to 2018 2018-02-28 21:06:33 +01:00
malte0811
56fb9e3b3a Merge branch 'MC1.12' into mechStuff 2018-02-19 20:39:55 +01:00
malte0811
b87b67b17f Fixed the redstone wire controller not connecting to RS wires 2018-02-09 21:17:14 +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
6000203141 Fixed panel component raytracing sorting
Components can no longer be activated through the back of the panel
2017-10-28 18:53:21 +02:00
malte0811
543368ad7c Fixed crashes with 2-channel components where the second id is selected, but not the channel 2017-10-27 21:08:17 +02:00
malte0811
8d4c0fcad2 Merge branch 'marx' into MC1.12 2017-09-04 17:42:50 +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
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
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
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
963755af78 Wire connections and bounding boxes for the Marx generator
Some misc stuff
2017-06-03 21:06:25 +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
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
06d8ddfff9 Merge remote-tracking branch 'origin/master' into MC1.11 2017-05-10 17:56:23 +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
7eecdea794 Build 1.4-8
Added the missing textures
Fixed a few minor bugs
2017-05-10 13:20:00 +02:00
malte0811
7cc0d9d9fe Added toggle switches, including a version with a cover to prevent accidental activation 2017-05-08 17:20:04 +02:00
malte0811
bf66a0fdc7 Added a variable transformer/Variac to put on control panels 2017-05-03 18:08:52 +02:00
malte0811
4586e57b84 Control panels can be disassembled in the panel creator now
added the missing background textures
changed the "base item" for control panels to be a basic machine casing
2017-05-01 18:40:29 +02:00
malte0811
6717e7c815 Added a model for the panel creator 2017-04-29 18:54:21 +02:00
malte0811
4e84a0d020 Added an item model for the control panel
Added some localization&other item models
2017-04-28 20:20:52 +02:00
malte0811
c15e68a716 Added textures for the panel component items
Made it possible to pick up single components from the panel creator GUI
2017-04-27 18:15:11 +02:00
malte0811
d02981e14d Added models for the RS panel connector
Fixed every block dropping the meta=0 version
2017-04-24 17:26:42 +02:00
malte0811
0327322198 Added editing GUI's for the other components
fixed a potential component dupe bug
2017-04-22 18:14:49 +02:00
malte0811
1d83fa7579 Added a GUI for editing panel components
Currently only available for buttons
2017-04-20 20:44:08 +02:00
malte0811
8cabaa9844 Added textures for the panel creator GUI and the control panel block
Fixed bounding box direction on the Jacob's ladders
2017-04-17 19:35:14 +02:00
malte0811
0ee914b7e6 Further work on panel creation
Added items to represent the panel components
2017-04-13 17:14:05 +02:00
malte0811
ee827b46ef Started implementing a GUI for creating control panels
fixed the default value for euPerIf, closes #6
2017-04-12 15:55:37 +02:00
malte0811
4bda8d458c fixed a crash on dedicated servers because for some reason AABB(Vec3d, Vec3d) is client-only
fixed copyright comments
2017-04-10 16:20:39 +02:00