Merge remote-tracking branch 'remotes/peekaboo/Pax1601-main' into v0.1.0

# Conflicts:
#	client/public/stylesheets/olympus.css
#	client/public/stylesheets/uikit.css
#	client/public/uikit.html
#	client/src/aic/aic.ts
#	client/src/index.ts
#	client/src/units/unitmarker.ts
#	client/views/unitcontrolpanel.ejs
This commit is contained in:
Pax1601
2023-03-03 19:03:09 +01:00
6 changed files with 13814 additions and 1050 deletions

View File

@@ -5,7 +5,7 @@ import { AICFormation_Single } from "./AICFormation/Single";
import { AICFormationDescriptorSection } from "./AICFormationDescriptorSection";
export class AIC extends ToggleableFeature {
export class aic extends ToggleableFeature {
#formations = [