diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1f795289..d0e863f3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -11,7 +11,7 @@ Note that you may need to remove the filter for open bugs if it's something we'v ## Making content for Liberation -You can create new campaigns : See [campaign creation wiki](https://github.com/Khopa/dcs_liberation/wiki/Custom-Campaigns). +You can create new campaigns : See [campaign creation wiki](https://github.com/dcs-liberation/dcs_liberation/wiki/Custom-Campaigns). You can also improve existing campaigns. You can then submit new campaigns on the "campaigns" channel on Discord, or by making a pull request if you are comfortable with git. diff --git a/README.md b/README.md index 3a032589..67f55b18 100644 --- a/README.md +++ b/README.md @@ -2,12 +2,12 @@ [![Patreon](https://img.shields.io/badge/patreon-become%20a%20patron-orange?logo=patreon)](https://patreon.com/khopa) -[![Download](https://img.shields.io/github/downloads/dcs-liberation/dcs_liberation/total?label=Download)](https://github.com/Khopa/dcs_liberation/releases) +[![Download](https://img.shields.io/github/downloads/dcs-liberation/dcs_liberation/total?label=Download)](https://github.com/dcs-liberation/dcs_liberation/releases) [![Discord](https://img.shields.io/discord/595702951800995872?label=Discord&logo=discord)](https://discord.gg/bKrtrkJ) -[![GitHub pull requests](https://img.shields.io/github/issues-pr/dcs-liberation/dcs_liberation)](https://github.com/Khopa/dcs_liberation) -[![GitHub issues](https://img.shields.io/github/issues/dcs-liberation/dcs_liberation)](https://github.com/Khopa/dcs_liberation/issues) +[![GitHub pull requests](https://img.shields.io/github/issues-pr/dcs-liberation/dcs_liberation)](https://github.com/dcs-liberation/dcs_liberation) +[![GitHub issues](https://img.shields.io/github/issues/dcs-liberation/dcs_liberation)](https://github.com/dcs-liberation/dcs_liberation/issues) ![GitHub stars](https://img.shields.io/github/stars/dcs-liberation/dcs_liberation?style=social) ## About DCS Liberation @@ -18,9 +18,9 @@ It is an external program that generates full and complex DCS missions and manag ## Downloads -Latest release is available here : https://github.com/Khopa/dcs_liberation/releases +Latest release is available here : https://github.com/dcs-liberation/dcs_liberation/releases -To download preview builds of the next version of DCS Liberation, see https://github.com/Khopa/dcs_liberation/wiki/Preview-builds. +To download preview builds of the next version of DCS Liberation, see https://github.com/dcs-liberation/dcs_liberation/wiki/Preview-builds. ## Bugs and feature requests @@ -28,7 +28,7 @@ If you need to report a bug or want to suggest a new feature, you can do this on ## Roadmap -Our plans for future releases can be found on our [Projects page](https://github.com/dcs-liberation/dcs_liberation/projects). Each planned release has a Project, and the page for that project has columns for to do, in progress, and done. Items in the Done column are in the [preview build](https://github.com/Khopa/dcs_liberation/wiki/Preview-builds) for that release. Items in the To do column are planned to be added to that release. +Our plans for future releases can be found on our [Projects page](https://github.com/dcs-liberation/dcs_liberation/projects). Each planned release has a Project, and the page for that project has columns for to do, in progress, and done. Items in the Done column are in the [preview build](https://github.com/dcs-liberation/dcs_liberation/wiki/Preview-builds) for that release. Items in the To do column are planned to be added to that release. ## Resources diff --git a/changelog.md b/changelog.md index 98e91bc3..20558db0 100644 --- a/changelog.md +++ b/changelog.md @@ -4,7 +4,7 @@ Saves from 2.5 are not compatible with 3.0. ## Features/Improvements -* **[Campaign]** Ground units can now be transferred by road, airlift, and cargo ship. See https://github.com/Khopa/dcs_liberation/wiki/Unit-Transfers for more information. +* **[Campaign]** Ground units can now be transferred by road, airlift, and cargo ship. See https://github.com/dcs-liberation/dcs_liberation/wiki/Unit-Transfers for more information. * **[Campaign]** Ground units can no longer be sold. To move units to a new location, transfer them. * **[Campaign]** Ground units must now be recruited at a base with a factory and transferred to their destination. When buying units in the UI, the purchase will automatically be fulfilled at the closest factory, and a transfer will be created on the next turn. * **[UI]** Campaigns generated for an older or newer version of the game will now be marked as incompatible. They can still be played, but bugs may be present. diff --git a/game/procurement.py b/game/procurement.py index 97453d3e..28a5d9bb 100644 --- a/game/procurement.py +++ b/game/procurement.py @@ -78,14 +78,14 @@ class ProcurementAi: def sell_incomplete_squadrons(self) -> float: # Selling incomplete squadrons gives us more money to spend on the next # turn. This serves as a short term fix for - # https://github.com/Khopa/dcs_liberation/issues/41. + # https://github.com/dcs-liberation/dcs_liberation/issues/41. # # Only incomplete squadrons which are unlikely to get used will be sold # rather than all unused aircraft because the unused aircraft are what # make OCA strikes worthwhile. # # This option is only used by the AI since players cannot cancel sales - # (https://github.com/Khopa/dcs_liberation/issues/365). + # (https://github.com/dcs-liberation/dcs_liberation/issues/365). total = 0.0 for cp in self.game.theater.control_points_for(self.is_player): inventory = self.game.aircraft_inventory.for_control_point(cp) diff --git a/gen/fleet/ru_dd_group.py b/gen/fleet/ru_dd_group.py index be98274c..bbd7b176 100644 --- a/gen/fleet/ru_dd_group.py +++ b/gen/fleet/ru_dd_group.py @@ -74,7 +74,7 @@ class RussianNavyGroupGenerator(ShipGroupGenerator): if include_cc: # Only include the Moskva for now, the Pyotry Velikiy is an unkillable monster. - # See https://github.com/Khopa/dcs_liberation/issues/567 + # See https://github.com/dcs-liberation/dcs_liberation/issues/567 self.add_unit( Cruiser_1164_Moskva, "CC1", diff --git a/gen/flights/closestairfields.py b/gen/flights/closestairfields.py index 76662c81..4d6bc4fb 100644 --- a/gen/flights/closestairfields.py +++ b/gen/flights/closestairfields.py @@ -18,7 +18,7 @@ class ClosestAirfields: self.target = target # This cache is configured once on load, so it's important that it is # complete and deterministic to avoid different behaviors across loads. - # E.g. https://github.com/Khopa/dcs_liberation/issues/819 + # E.g. https://github.com/dcs-liberation/dcs_liberation/issues/819 self.closest_airfields: List[ControlPoint] = sorted( all_control_points, key=lambda c: self.target.distance_to(c) ) diff --git a/gen/radios.py b/gen/radios.py index ae72922b..d983695b 100644 --- a/gen/radios.py +++ b/gen/radios.py @@ -206,7 +206,7 @@ class RadioRegistry: except StopIteration: # In the event of too many channel users, fail gracefully by reusing # the last channel. - # https://github.com/Khopa/dcs_liberation/issues/598 + # https://github.com/dcs-liberation/dcs_liberation/issues/598 channel = radio.last_channel logging.warning( f"No more free channels for {radio.name}. Reusing {channel}." diff --git a/installer/dcs_liberation.iss b/installer/dcs_liberation.iss index cd53dda3..c20edb05 100644 --- a/installer/dcs_liberation.iss +++ b/installer/dcs_liberation.iss @@ -4,7 +4,7 @@ #define MyAppName "DCS Liberation" #define MyAppVersion "{{version}}" #define MyAppPublisher "Khopa" -#define MyAppURL "https://github.com/Khopa/dcs_liberation/wiki" +#define MyAppURL "https://github.com/dcs-liberation/dcs_liberation/wiki" #define MyAppExeName "liberation_main.exe" [Setup] diff --git a/qt_ui/uiconstants.py b/qt_ui/uiconstants.py index e34515e0..52b9300f 100644 --- a/qt_ui/uiconstants.py +++ b/qt_ui/uiconstants.py @@ -8,10 +8,10 @@ from .liberation_theme import get_theme_icons URLS: Dict[str, str] = { - "Manual": "https://github.com/khopa/dcs_liberation/wiki", - "Repository": "https://github.com/khopa/dcs_liberation", + "Manual": "https://github.com/dcs-liberation/dcs_liberation/wiki", + "Repository": "https://github.com/dcs-liberation/dcs_liberation", "ForumThread": "https://forums.eagle.ru/showthread.php?t=214834", - "Issues": "https://github.com/khopa/dcs_liberation/issues", + "Issues": "https://github.com/dcs-liberation/dcs_liberation/issues", } LABELS_OPTIONS = ["Full", "Abbreviated", "Dot Only", "Off"] diff --git a/qt_ui/windows/QLiberationWindow.py b/qt_ui/windows/QLiberationWindow.py index 8098ed77..d12bbb28 100644 --- a/qt_ui/windows/QLiberationWindow.py +++ b/qt_ui/windows/QLiberationWindow.py @@ -143,7 +143,7 @@ class QLiberationWindow(QMainWindow): self.openGithubAction = QAction("&Github Repo", self) self.openGithubAction.setIcon(CONST.ICONS["Github"]) self.openGithubAction.triggered.connect( - lambda: webbrowser.open_new_tab("https://github.com/khopa/dcs_liberation") + lambda: webbrowser.open_new_tab("https://github.com/dcs-liberation/dcs_liberation") ) def initToolbar(self): @@ -202,7 +202,7 @@ class QLiberationWindow(QMainWindow): help_menu.addAction( "&Releases", lambda: webbrowser.open_new_tab( - "https://github.com/Khopa/dcs_liberation/releases" + "https://github.com/dcs-liberation/dcs_liberation/releases" ), ) help_menu.addAction( @@ -309,7 +309,7 @@ class QLiberationWindow(QMainWindow): "

DCS Liberation " + VERSION + "

" - + "Source code : https://github.com/khopa/dcs_liberation" + + "Source code : https://github.com/dcs-liberation/dcs_liberation" + "

Authors

" + "

DCS Liberation was originally developed by shdwp, DCS Liberation 2.0 is a partial rewrite based on this work by Khopa." "

Contributors

" diff --git a/qt_ui/windows/mission/QPackageDialog.py b/qt_ui/windows/mission/QPackageDialog.py index 666f8539..444fc33b 100644 --- a/qt_ui/windows/mission/QPackageDialog.py +++ b/qt_ui/windows/mission/QPackageDialog.py @@ -92,7 +92,7 @@ class QPackageDialog(QDialog): self.tot_column.addWidget(self.auto_asap) self.tot_help_label = QLabel( - 'Help' + 'Help' ) self.tot_help_label.setAlignment(Qt.AlignCenter) self.tot_help_label.setOpenExternalLinks(True) diff --git a/qt_ui/windows/mission/flight/payload/QFlightPayloadTab.py b/qt_ui/windows/mission/flight/payload/QFlightPayloadTab.py index b61fe432..131802dd 100644 --- a/qt_ui/windows/mission/flight/payload/QFlightPayloadTab.py +++ b/qt_ui/windows/mission/flight/payload/QFlightPayloadTab.py @@ -18,7 +18,7 @@ class QFlightPayloadTab(QFrame): # Docs Link docsText = QLabel( - 'How to create your own default loadout' + 'How to create your own default loadout' ) docsText.setAlignment(Qt.AlignCenter) docsText.setOpenExternalLinks(True) diff --git a/qt_ui/windows/newgame/QNewGameWizard.py b/qt_ui/windows/newgame/QNewGameWizard.py index 8f4bb54d..87e34ab9 100644 --- a/qt_ui/windows/newgame/QNewGameWizard.py +++ b/qt_ui/windows/newgame/QNewGameWizard.py @@ -208,7 +208,7 @@ class FactionSelection(QtWidgets.QWizardPage): # Docs Link docsText = QtWidgets.QLabel( - 'How to create your own faction' + 'How to create your own faction' ) docsText.setAlignment(Qt.AlignCenter) docsText.setOpenExternalLinks(True) @@ -400,7 +400,7 @@ class TheaterConfiguration(QtWidgets.QWizardPage): # Docs Link docsText = QtWidgets.QLabel( - 'How to create your own theater' + 'How to create your own theater' ) docsText.setAlignment(Qt.AlignCenter) docsText.setOpenExternalLinks(True) diff --git a/qt_ui/windows/settings/QSettingsWindow.py b/qt_ui/windows/settings/QSettingsWindow.py index 7b42a44d..8af7df3d 100644 --- a/qt_ui/windows/settings/QSettingsWindow.py +++ b/qt_ui/windows/settings/QSettingsWindow.py @@ -85,7 +85,7 @@ NEW_GROUND_UNIT_RECRUITMENT_TOOLTIP = ( ) NEW_GROUND_UNIT_RECRUITMENT_BEHAVIOR_LABEL = ( "Enable new ground unit recruitment behavior
" - '' + '' 'More information.' ) diff --git a/resources/plugins/jtacautolase/jtacautolase-config.lua b/resources/plugins/jtacautolase/jtacautolase-config.lua index 38d02911..c8ad8301 100644 --- a/resources/plugins/jtacautolase/jtacautolase-config.lua +++ b/resources/plugins/jtacautolase/jtacautolase-config.lua @@ -2,7 +2,7 @@ -- configuration file for the JTAC Autolase framework -- -- This configuration is tailored for a mission generated by DCS Liberation --- see https://github.com/Khopa/dcs_liberation +-- see https://github.com/dcs-liberation/dcs_liberation ------------------------------------------------------------------------------------------------------------------------------------------------------------- -- JTACAutolase plugin - configuration diff --git a/resources/plugins/lotatc/LotAtcExport-config.lua b/resources/plugins/lotatc/LotAtcExport-config.lua index 494be5f1..f7b0d876 100644 --- a/resources/plugins/lotatc/LotAtcExport-config.lua +++ b/resources/plugins/lotatc/LotAtcExport-config.lua @@ -2,7 +2,7 @@ -- configuration file for the LotATC Export script -- -- This configuration is tailored for a mission generated by DCS Liberation --- see https://github.com/Khopa/dcs_liberation +-- see https://github.com/dcs-liberation/dcs_liberation ------------------------------------------------------------------------------------------------------------------------------------------------------------- -- LotATC Export plugin - configuration diff --git a/resources/plugins/skynetiads/skynetiads-config.lua b/resources/plugins/skynetiads/skynetiads-config.lua index fafa8104..aa0ce992 100644 --- a/resources/plugins/skynetiads/skynetiads-config.lua +++ b/resources/plugins/skynetiads/skynetiads-config.lua @@ -3,7 +3,7 @@ -- see https://github.com/walder/Skynet-IADS -- -- This configuration is tailored for a mission generated by DCS Liberation --- see https://github.com/Khopa/dcs_liberation +-- see https://github.com/dcs-liberation/dcs_liberation ------------------------------------------------------------------------------------------------------------------------------------------------------------- -- Skynet-IADS plugin - configuration diff --git a/resources/ui/templates/mission_start_EN.j2 b/resources/ui/templates/mission_start_EN.j2 index a162635b..2dc1ce79 100644 --- a/resources/ui/templates/mission_start_EN.j2 +++ b/resources/ui/templates/mission_start_EN.j2 @@ -21,7 +21,7 @@

For more information, see the mission planning documentation on - + the wiki.