Skip to content

Commit 88d9c7f

Browse files
committed
Merge branch 'mechjeb'
2 parents ca2524e + 94870e0 commit 88d9c7f

22 files changed

Lines changed: 4565 additions & 4844 deletions

.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,5 @@ on:
1818
jobs:
1919
build:
2020
uses: KSPModdingLibs/KSPBuildTools/.github/workflows/build.yml@1.1.1
21+
with:
22+
use-ckan: true

.github/workflows/create-release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ jobs:
1212
uses: KSPModdingLibs/KSPBuildTools/.github/workflows/create-release.yml@1.1.1
1313
with:
1414
version-string: ${{ inputs.version-string }}
15+
use-ckan: true

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@ pip-log.txt
220220
.mr.developer.cfg
221221
GameData/JSI/RasterPropMonitor/Plugins/RasterPropMonitor.dll
222222
GameData/JSI/RasterPropMonitor/Plugins/MechJebRPM.dll
223+
GameData/JSI/RasterPropMonitor/Plugins/MechJebRPM.pdb
223224
dev_README.txt
224225
GameData/ModuleManager.*.dll
225226
GameData/JSI/JSIAdvTransparentPods/Plugins/JSIAdvTransparentPods.dll
@@ -236,4 +237,5 @@ GameData/JSI/JSIAdvTransparentPods/Plugins/JSIAdvTransparentPods.dll
236237
/GameData/JSI/RasterPropMonitor/Plugins/RasterPropMonitor.pdb
237238
/GameData/JSI/RasterPropMonitor/RasterPropMonitor.version
238239
/packages/
239-
/Releases
240+
/Releases
241+
*.lscache

CHANGELOG.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,22 @@ Discord support server: https://discord.gg/vBDzZAq3AF.
44

55
Please always post your [KSP.log file](https://gist.github.com/JonnyOThan/04c2074b56f78e56d115621effee30f9) when reporting issues.
66

7+
## Unreleased
8+
9+
- Fixed MechJeb button/switch integration
10+
11+
## 1.1.0.0 - 2026-04-13
12+
13+
Note that due to changes in MechJeb, this version of RPM is not compatible with MJ 2.14 and earlier. If you wish to use earlier versions of MJ, please use RPM 1.0.3.
14+
15+
### New Features
16+
17+
- Rebuilt MechJeb2 integration for MJ 2.15. Nearly all features of MJ are now available on the MFD. (thanks @bryguy4 / @adventure-gpt)
18+
19+
720
## 1.0.3.2 - 2026-04-11
821

9-
NOTE: this version of RPM is not compatible with MJ 2.15
22+
Note that due to changes in MechJeb, this version (and all previous versions of RPM) are not compatible with MJ 2.15 and later. If you use MJ, please downgrade it to 2.14.3 before trying to install RPM 1.0.3 or else you will likely see conflicts in CKAN.
1023

1124
### New Features
1225

GameData/JSI/RPMPodPatches/RasterPropMonitor.ckan

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ suggests:
1313
- name: NavUtilities
1414
- name: SCANsat
1515
- name: MechJeb2
16-
max_version: 2.14.3.0
1716
- name: VesselView
1817
- name: ProbeControlRoomRecontrolled
1918
- name: kOSPropMonitor
@@ -27,7 +26,7 @@ suggests:
2726
- name: KSAIVAUpgrade
2827
conflicts:
2928
- name: MechJeb2
30-
min_version: 2.15.0.0
29+
max_version: 2.14
3130
install:
3231
- find: JSI/RPMPodPatches
3332
install_to: GameData/JSI

GameData/JSI/RasterPropMonitor/RasterPropMonitor-Core.ckan

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ suggests:
1212
- name: NavUtilities
1313
- name: SCANsat
1414
- name: MechJeb2
15-
max_version: 2.14.3.0
1615
- name: VesselView
1716
- name: ProbeControlRoomRecontrolled
1817
- name: kOSPropMonitor
@@ -26,7 +25,7 @@ suggests:
2625
- name: KSAIVAUpgrade
2726
conflicts:
2827
- name: MechJeb2
29-
min_version: 2.15.0.0
28+
max_version: 2.14
3029
install:
3130
- find: JSI/RasterPropMonitor
3231
install_to: GameData/JSI

0 commit comments

Comments
 (0)