Merge pull request #822 from EDCD/develop

Develop
Merge pull request #821 from Brighter-Applications/develop
2025-12-09 14:45:35 +00:00 · 2025-06-28 14:32:28 +01:00 · 2025-06-28 14:31:03 +01:00 · 2025-06-28 14:27:55 +01:00 · 2025-04-10 12:33:51 +01:00 · 2024-12-13 20:57:51 +00:00
4 changed files with 5 additions and 1 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [Brighter-Applications]
--- a/src/app/Coriolis.jsx
+++ b/src/app/Coriolis.jsx
@@ -69,7 +69,7 @@ export default class Coriolis extends React.Component {
      noTouch: !('ontouchstart' in window || navigator.msMaxTouchPoints || navigator.maxTouchPoints),
      page: null,
      // Announcements must have an expiry date in format "YYYY-MM-DDTHH:MM:SSZ"
-      announcements: [{expiry: "2024-11-30T00:00:00Z", text: "Mandalay added"}, {expiry: "2024-12-06T00:00:00Z", text: "Concord Cannon added"}, {expiry: "2024-12-08T00:00:00Z", text: "Boost Interval Feature added"}],
+      announcements: [{expiry: "2025-04-10T00:00:00Z", text: "Corsair added"}],
      language: getLanguage(Persist.getLangCode()),
      route: {},
      sizeRatio: Persist.getSizeRatio()
--- a/src/app/i18n/de.js
+++ b/src/app/i18n/de.js
@@ -14,3 +14,4 @@ export const formats = {
 };

 export { default as terms } from './de.json';
+
--- a/src/app/utils/CompanionApiUtils.js
+++ b/src/app/utils/CompanionApiUtils.js
@@ -14,6 +14,8 @@ export const SHIP_FD_NAME_TO_CORIOLIS_NAME = {
  'BelugaLiner': 'beluga',
  'CobraMkIII': 'cobra_mk_iii',
  'CobraMkIV': 'cobra_mk_iv',
+  'CobraMkV': 'cobramkv',
+  'Corsair': 'imperial_corsair',
  'Cutter': 'imperial_cutter',
  'DiamondBackXL': 'diamondback_explorer',
  'DiamondBack': 'diamondback',
Author	SHA1	Message	Date
Alex Williams	fa9fe1c571	Merge pull request #822 from EDCD/develop Develop	2025-06-28 14:32:28 +01:00
Alex Williams	1dfd3cdc23	Merge pull request #821 from Brighter-Applications/develop Develop	2025-06-28 14:31:03 +01:00
Alex Williams	a3d7c8b7a7	Features/add corsair (#94 ) * Corsair Added Announcement * Adding FDName Corsair Translation to imperial_corsair Coriolis internal name	2025-06-28 14:27:55 +01:00
Alex Williams	60a05d93c8	Features/add_corsair (#93 ) * Corsair Added Announcement * Adding FDName Corsair Translation to imperial_corsair Coriolis internal name	2025-04-10 12:33:51 +01:00
Alex Williams	7f3056560d	Merge pull request #88 from Brighter-Applications/features/add_cobra5 Adding coriolis to fdname conversion	2024-12-13 20:57:51 +00:00
Alex Williams	43718e15cf	Adding coriolis to fdname conversion	2024-12-13 20:46:16 +00:00
Alex Williams	8a1ad353e2	Merge pull request #85 from Brighter-Applications/features/add_cobra5 Adding Cobra Mk V	2024-12-13 19:55:37 +00:00
Alex Williams	fbe29d8087	Adding Cobra Mk V	2024-12-13 19:46:46 +00:00
Alex Williams	00f098ca29	Merge branch 'master' into master	2024-11-23 21:58:04 +00:00
Alex Williams	ed6cc49ae8	Merge pull request #799 from EDCD/develop Develop	2024-11-23 21:52:48 +00:00
Alex Williams	f22b7ff577	Fixing old errors	2024-10-31 21:43:29 +00:00
Alex Williams	fde4bba714	Create FUNDING.yml	2024-10-31 21:00:05 +00:00
				`@@ -0,0 +1 @@`
				`github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [Brighter-Applications]`