Sebastian Malton e2872fb9d8 imerge 'issue-3498': manual merge 1-1 ... # Conflicts: # package.json # packages/core/src/common/catalog/__tests__/helpers.test.ts # packages/core/src/common/catalog/helpers.ts # packages/core/src/common/cluster-store/migration-version.injectable.ts # packages/core/src/common/hotbars/migration-version.injectable.ts # packages/core/src/common/ipc/catalog.ts # packages/core/src/common/user-store/migration-version.injectable.ts # packages/core/src/common/vars/store-migration-version.injectable.ts # packages/core/src/common/weblinks-store/migration-version.injectable.ts # packages/core/src/extensions/extension-loader/file-system-provisioner-store/migration-version.injectable.ts # packages/core/src/extensions/extensions-store/migration-version.injectable.ts # packages/core/src/features/entity-settings/__snapshots__/limit-short-name-length.test.tsx.snap # packages/core/src/features/entity-settings/limit-short-name-length.test.tsx # packages/core/src/features/hotbar/__snapshots__/shows-custom-entity-names.test.tsx.snap # packages/core/src/features/hotbar/shows-custom-entity-names.test.tsx # packages/core/src/main/catalog-sync-to-renderer/broadcaster.global-override-for-injectable.ts # packages/core/src/main/catalog-sync-to-renderer/broadcaster.injectable.ts # packages/core/src/main/catalog-sync-to-renderer/push-catalog-to-renderer.injectable.ts # packages/core/src/main/catalog/index.ts # packages/core/src/renderer/components/+entity-settings/internal-kubernetes-cluster/general-settings.injectable.tsx # packages/core/src/renderer/components/+entity-settings/internal-kubernetes-cluster/metrics-settings.injectable.tsx # packages/core/src/renderer/components/+entity-settings/internal-kubernetes-cluster/namespace-settings.injectable.tsx # packages/core/src/renderer/components/+entity-settings/internal-kubernetes-cluster/node-shell-settings.injectable.tsx # packages/core/src/renderer/components/+entity-settings/internal-kubernetes-cluster/proxy-settings.injectable.tsx # packages/core/src/renderer/components/+entity-settings/internal-kubernetes-cluster/terminal-settings.injectable.tsx # packages/core/src/renderer/components/animate/is-enabled.global-override-for-injectable.ts # packages/core/src/renderer/components/animate/is-enabled.injectable.ts # packages/core/src/renderer/components/avatar/compute-random-color.global-override-for-injectable.ts # packages/core/src/renderer/components/avatar/compute-random-color.injectable.ts # src/main/catalog/index.ts # src/renderer/components/+entity-settings/internal-kubernetes-cluster/general-settings.injectable.tsx # src/renderer/components/+entity-settings/internal-kubernetes-cluster/metrics-settings.injectable.tsx # src/renderer/components/+entity-settings/internal-kubernetes-cluster/namespace-settings.injectable.tsx # src/renderer/components/+entity-settings/internal-kubernetes-cluster/node-shell-settings.injectable.tsx # src/renderer/components/+entity-settings/internal-kubernetes-cluster/proxy-settings.injectable.tsx # src/renderer/components/+entity-settings/internal-kubernetes-cluster/terminal-settings.injectable.tsx # src/renderer/components/+entity-settings/internal/kubernetes-cluster/general-settings.injectable.tsx # src/renderer/components/+entity-settings/internal/kubernetes-cluster/metrics-settings.injectable.tsx # src/renderer/components/+entity-settings/internal/kubernetes-cluster/namespace-settings.injectable.tsx # src/renderer/components/+entity-settings/internal/kubernetes-cluster/node-shell-settings.injectable.tsx # src/renderer/components/+entity-settings/internal/kubernetes-cluster/proxy-settings.injectable.tsx # src/renderer/components/+entity-settings/internal/kubernetes-cluster/terminal-settings.injectable.tsx # src/renderer/components/entity-icon/index.ts # yarn.lock		2023-01-24 15:12:32 -05:00
..
__mocks__	Restructure to monorepo (#6907)	2023-01-24 10:46:26 -08:00
build	Restructure to monorepo (#6907)	2023-01-24 10:46:26 -08:00
src	imerge 'issue-3498': manual merge 1-1	2023-01-24 15:12:32 -05:00
static	Restructure to monorepo (#6907)	2023-01-24 10:46:26 -08:00
test-data	Restructure to monorepo (#6907)	2023-01-24 10:46:26 -08:00
types	Restructure to monorepo (#6907)	2023-01-24 10:46:26 -08:00
webpack	Restructure to monorepo (#6907)	2023-01-24 10:46:26 -08:00
.eslintrc.js	Restructure to monorepo (#6907)	2023-01-24 10:46:26 -08:00
.gitignore	Restructure to monorepo (#6907)	2023-01-24 10:46:26 -08:00
.swcrc	Restructure to monorepo (#6907)	2023-01-24 10:46:26 -08:00
.yarnrc	Restructure to monorepo (#6907)	2023-01-24 10:46:26 -08:00
package.json	Restructure to monorepo (#6907)	2023-01-24 10:46:26 -08:00
tailwind.config.js	Restructure to monorepo (#6907)	2023-01-24 10:46:26 -08:00
tsconfig.json	Restructure to monorepo (#6907)	2023-01-24 10:46:26 -08:00
yarn.lock	Restructure to monorepo (#6907)	2023-01-24 10:46:26 -08:00