Skip to content

Commit 660c09c

Browse files
wildfire142wildfire142
authored
Merge branch 'MegaMek:master' into personnel-report-typos
2 parents e2691ba + 6e9e147 commit 660c09c

File tree

450 files changed

+10976
-3912
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

450 files changed

+10976
-3912
lines changed

‎MekHQ/build.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ dependencies {
8181
implementation 'org.apache.commons:commons-text:1.13.1'
8282
implementation 'org.apache.logging.log4j:log4j-core:2.24.3'
8383

84+
implementation 'org.apache.pdfbox:pdfbox:3.0.5'
85+
8486
implementation 'org.commonmark:commonmark:0.24.0'
8587

8688
implementation 'org.jfree:jfreechart:1.5.6'

‎MekHQ/data/universe/commands/CC.AH.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
key: CC.AH
2+
name: Andurien Hussars
3+
yearsActive:
4+
- start: 2556
5+
end: 3000
6+
ratingLevels:
7+
- C
8+
fallBackFactions:
9+
- CC

‎MekHQ/data/universe/commands/CC.CB.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
key: CC.CB
2+
name: Capellan Brigade
3+
yearsActive:
4+
- start: 3061
5+
ratingLevels:
6+
- D
7+
fallBackFactions:
8+
- CC

‎MekHQ/data/universe/commands/CC.CC.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
key: CC.CC
2+
name: Capellan Chargers
3+
yearsActive:
4+
- start: 2367
5+
end: 2835
6+
- start: 3135
7+
ratingLevels:
8+
- B
9+
fallBackFactions:
10+
- CC

‎MekHQ/data/universe/commands/CC.CDF.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
key: CC.CDF
2+
name: Capellan Defense Force
3+
yearsActive:
4+
- start: 3057
5+
ratingLevels:
6+
- D
7+
fallBackFactions:
8+
- CC

‎MekHQ/data/universe/commands/CC.CH.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
key: CC.CH
2+
name: Capellan Hussars
3+
yearsActive:
4+
- start: 2367
5+
ratingLevels:
6+
- A
7+
fallBackFactions:
8+
- CC

‎MekHQ/data/universe/commands/CC.CHG.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
key: CC.CHG
2+
name: Capellan Home Guard
3+
yearsActive:
4+
- start: 2367
5+
ratingLevels:
6+
- F
7+
fallBackFactions:
8+
- CC

‎MekHQ/data/universe/commands/CC.CHO.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
key: CC.CHO
2+
name: Citizens' Honored
3+
yearsActive:
4+
- start: 3060
5+
ratingLevels:
6+
- B
7+
fallBackFactions:
8+
- CC

‎MekHQ/data/universe/commands/CC.CR.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
key: CC.CR
2+
name: Chesterton Regulars
3+
yearsActive:
4+
- start: 2832
5+
end: 3060
6+
ratingLevels:
7+
- C
8+
fallBackFactions:
9+
- CC

‎MekHQ/data/universe/commands/CC.CRC.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
key: CC.CRC
2+
name: Confederation Reserve Cavalry
3+
yearsActive:
4+
- start: 2650
5+
ratingLevels:
6+
- F
7+
fallBackFactions:
8+
- CC

0 commit comments

Comments
 (0)