ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
dc6f931f9cfe0b92d6ec6bae836567c8132d4f28
gemp-lotr/gemp-lotr
History
MarcinSc dc6f931f9c Merge remote-tracking branch 'upstream/grand-card-rework' into grand-card-rework 
# Conflicts:
#	gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set3-shire.hjson
#	gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/EffectAppenderFactory.java
#	gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/DiscardFromHandBy.java
2024-05-31 13:35:02 +07:00
..
db
Merge branch 'master' into grand-card-rework
2024-05-03 00:48:49 -05:00
docker
Merge branch 'master' into grand-card-rework. Had to manually merge the yuletide errata changes.
2024-04-24 21:23:42 -05:00
gemp-lotr-async
Merge branch 'master' into grand-card-rework
2024-05-19 13:33:36 -05:00
gemp-lotr-cards
Merge remote-tracking branch 'upstream/grand-card-rework' into grand-card-rework
2024-05-31 13:35:02 +07:00
gemp-lotr-common
Migrated Rohan cards in set 17 to hjson
2024-05-26 17:01:30 +07:00
gemp-lotr-images
Upgrading Java from 17 -> 21 and upgrading all dependencies
2024-04-16 23:58:49 -05:00
gemp-lotr-logic
Merge remote-tracking branch 'upstream/grand-card-rework' into grand-card-rework
2024-05-31 13:35:02 +07:00
gemp-lotr-server
Continued cleanup and fixes
2024-05-30 15:17:41 +07:00
.gitignore
Fixing .gitignore directive causing the entire "cards/build" directory to get ignored when attempting to check in.
2021-03-14 18:29:50 -05:00
card-definition-example.hjson
Pack definition overhaul
2022-09-06 03:43:34 -05:00
database_script.sql
Adding missing table to the init db script, adding missing log file, dockerfile updates
2023-06-10 21:45:16 -05:00
pom.xml
Upgrading Java from 17 -> 21 and upgrading all dependencies
2024-04-16 23:58:49 -05:00
README.md
Added short readme
2021-04-19 22:49:26 -07:00
todo.txt
Sealed overhaul
2022-09-11 17:46:54 -05:00

README.md

Gempukku LotR (Lord of the Rings)

This code originated in the following Github repository: https://github.com/marcinsc

It has been transferred to Player's Committee for an ongoing support.