Merge remote-tracking branch 'origin/feature/jade_plug' into feature/jade_plug
# Conflicts: # src/main/java/com/extendedae_plus/integration/jade/WirelessTransceiverJadePluginComponents.java
This commit is contained in:
commit
56b2307afd