Christian 'ketura' McCarty a4b04132d5 Merge branch 'master' into card-dev
# Conflicts:
#	gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js
#	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/TriggerCheckerFactory.java
#	gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/TriggerConditions.java
2021-12-16 00:47:11 -06:00
2021-01-05 14:06:41 -06:00
2018-04-16 13:47:29 -07:00

gemp-lotr

Gemp-LotR Online - server/client for playing LotR TCG using web browser. The program takes care of all the rules so you don't have to.

Description
No description provided
Readme 99 MiB
Languages
Java 90%
JavaScript 7.3%
HTML 2.4%
CSS 0.3%