Christian 'ketura' McCarty f8ad13a546 Merge branch 'v2-cards' into feature/autozoom ...

# Conflicts:
#	gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deckBuildingUi.js
#	gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Names.java
#	gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java
#	gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/packs/SetDefinition.java
#	gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/SortAndFilterCards.java

2024-11-05 12:28:50 -06:00

..

css

Importing card display rework from SWCCG - Deckbuilder

2024-10-15 01:18:39 -05:00

images

Importing card display rework from SWCCG - Deckbuilder

2024-10-15 01:18:39 -05:00

includes

Merge branch 'grand-card-rework' into v2-cards

2024-09-19 10:24:06 -05:00

js

Merge branch 'v2-cards' into feature/autozoom

2024-11-05 12:28:50 -06:00

src

Importing card display rework from SWCCG - Deckbuilder

2024-10-15 01:18:39 -05:00

admin.html

Adding hidden admin tab for pertinent users

2022-08-26 17:26:50 -05:00

ban.html

Adding hidden admin tab for pertinent users

2022-08-26 17:26:50 -05:00

deckBuild2.html

Committing a half-finished rework of the deckbuilding UI to be completed later

2024-04-19 07:50:24 -05:00

deckBuild.html

Importing card display rework from SWCCG - Deckbuilder

2024-10-15 01:18:39 -05:00

favicon.ico

ui cleanup and features

2022-09-09 07:14:57 -05:00

game.html

capitalization typos

2024-05-06 01:20:13 -05:00

hall.html

More WC table fixes

2023-08-13 13:02:07 -05:00

index.html

simple POC for index

2023-01-17 17:43:53 -08:00

js.inc

Checking in stubs for the FOTR starter supplements

2021-01-06 00:15:56 -06:00

layoutest.html

Committing a half-finished rework of the deckbuilding UI to be completed later

2024-04-19 07:50:24 -05:00

leagueAdmin.html

Adding hidden admin tab for pertinent users

2022-08-26 17:26:50 -05:00

merchant.html

moved merchant game and hall

2023-01-20 09:31:44 -08:00

soloDraft.html

removed the deckBuild2 since it never finished

2023-01-20 09:36:11 -08:00