Commit Graph

2557 Commits

Author SHA1 Message Date
Anthony Calosa
83df147d0e Merge branch 'master' into master2
# Conflicts:
#	forge-adventure/pom.xml
#	forge-ai/pom.xml
#	forge-core/pom.xml
#	forge-game/pom.xml
#	forge-gui-android/AndroidManifest.xml
#	forge-gui-android/pom.xml
#	forge-gui-desktop/pom.xml
#	forge-gui-ios/pom.xml
#	forge-gui-mobile-dev/pom.xml
#	forge-gui-mobile/pom.xml
#	forge-gui-mobile/src/forge/Forge.java
#	forge-gui/pom.xml
#	forge-lda/pom.xml
#	pom.xml
2024-10-15 10:29:23 +08:00
Chris H
0475f4bafa Manually update files that need to be updated 2024-10-14 21:53:45 -04:00
GitHub Actions
d366bf8ffc [maven-release-plugin] prepare for next development iteration 2024-10-14 21:53:45 -04:00
GitHub Actions
fa538bd5c9 [maven-release-plugin] prepare release forge-1.6.65 2024-10-14 21:53:45 -04:00
Anthony Calosa
644fa46681 Merge branch 'master' into master2 2024-10-09 16:44:29 +08:00
Anthony Calosa
708fed3350 update and unified version code property 2024-10-09 12:32:09 +08:00
Jetz72
48adeb357d Show chosen mana for mana abilities as symbols (#6256)
* Support for icons in dialogs.
Mana abilities show chosen mana via icons.
Thread safety for showOptionDialog

* Ensure EventDispatchThread for showInputDialog

---------

Co-authored-by: Jetz <Jetz722@gmail.com>
2024-10-08 22:17:18 +03:00
Anthony Calosa
0594627833 fix pom entries 2024-10-07 17:00:40 +08:00
Anthony Calosa
eada2c6d4f Merge branch 'master' into master2 2024-10-07 06:06:05 +08:00
Hans Mackowiak
80b30d9a6a Room: First Spell Part (#6044)
* Room: First Spell 

----

Co-authored-by: tool4ever <therealtoolkit@hotmail.com>
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
Co-authored-by: TRT <>
Co-authored-by: Anthony Calosa <anthonycalosa@gmail.com>
2024-10-06 20:11:28 +02:00
Anthony Calosa
4dfd344298 add JVM check 2024-10-06 15:29:51 +08:00
Anthony Calosa
4f819a9be3 update launch4j 2024-10-05 21:25:28 +08:00
Anthony Calosa
a322dd45d8 update dependency 2024-10-05 13:13:58 +08:00
Anthony Calosa
7594888f8e SKIN Update 2024-09-29 15:25:11 +08:00
Anthony Calosa
352967c8b8 update proguard, fix expected stack map table for method with non-linear control flow 2024-09-26 22:40:17 +08:00
Anthony Calosa
3a41f9d492 update more dependency, update CardMockTestCase 2024-09-26 19:36:59 +08:00
Anthony Calosa
a7c69da4e6 fix tests 2024-09-26 13:17:02 +08:00
Anthony Calosa
56400d4444 JAVA17 Update 2024-09-26 11:52:42 +08:00
Anthony Calosa
bbc3d5639c update maven, dependency plugins 2024-09-17 20:05:37 +08:00
Anthony Calosa
edc3af50af Merge branch 'master' into master2 2024-09-14 08:08:00 +08:00
Paul Hammerton
33e733559e fix_test 2024-09-13 17:27:43 +01:00
Anthony Calosa
78f3d3d74d update more dependency 2024-09-10 23:39:51 +08:00
Anthony Calosa
a8f6842e21 update some dependency 2024-09-08 21:30:29 +08:00
Anthony Calosa
09b5ee8ac5 update android builds to SDK 29, use Java 11 2024-09-08 20:44:23 +08:00
tool4ever
756ba28a14 Some fixes (#6004)
* Fix NPE
2024-08-28 15:54:28 +00:00
Jetz
4afc86b4b4 Support functional variants in translations 2024-08-26 00:25:43 -04:00
Hans Mackowiak
77710cf1b0 refactor LandAbility to be created by CardFactory (#5047)
---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.60>
2024-08-23 10:57:33 +02:00
Chris H
d2178756b5 Declare Forge user agent (#5946) 2024-08-18 19:17:43 +02:00
Chris H
4554dee721 Generate individual booster slots with individual replacement percentages
Convert MH3 to booster slot percentages
2024-08-16 16:57:21 -04:00
Chris H
8be414d9dd Blb release (#5929)
* [maven-release-plugin] prepare release forge-1.6.64

* [maven-release-plugin] prepare for next development iteration

* Update pom.xml

* Update AndroidManifest.xml

* Update pom.xml

* Update Forge.java

---------

Co-authored-by: GitHub Actions <actions@github.com>
2024-08-14 21:06:29 -04:00
Jetz
27046744a4 Cleanup - Unused imports 2024-08-10 13:14:53 -04:00
Jetz
2fb7ad0c7b Cleanup - Statement lambda -> expression lambda 2024-08-10 12:58:32 -04:00
Jetz
4614c6c0c9 Cleanup - Map.getOrDefault and Map.computeIfAbsent 2024-08-10 12:48:52 -04:00
Jetz
bdc890c32c Cleanup - Collections.sort -> list.sort 2024-08-10 12:43:38 -04:00
Jetz
0ee46ff6ef Cleanup - .equals("") -> .isEmpty() 2024-08-10 12:28:18 -04:00
Jetz
9bbe4805a3 Cleanup - Redundant String.format 2024-08-10 12:21:50 -04:00
Jetz
daa9d59a67 Cleanup - addAll -> constructor parameter 2024-08-10 12:17:54 -04:00
Jetz
b417946032 Cleanup - PowerMock ignores for newer JDKs 2024-08-10 12:12:05 -04:00
Jetz
ae9877ce3c Cleanup - Collection.toArray 2024-08-10 10:25:35 -04:00
Paul Hammerton
cc6d3aa2e4 fix_tests 2024-08-10 14:00:57 +01:00
Paul Hammerton
982c2eeab5 Update CardDbCardMockTestCase.java 2024-08-03 14:52:03 +01:00
Paul Hammerton
30c10f5e08 Update CardDbCardMockTestCase.java 2024-08-03 14:46:03 +01:00
Paul Hammerton
1d443eb337 Update CardDbCardMockTestCase.java 2024-08-03 14:34:35 +01:00
Jetz72
d62dfe1c8c Miscallaneous Cleanup Part 2 - Lambdas and Method References (#5737)
* Cleanup - Unnecessary Boxing

* Cleanup - Unnecessary Unboxing

* Cleanup - For-Each Loops

* Cleanup - `indexOf != -1` -> `contains`

* Cleanup - Merge identical catch blocks

* Cleanup - Try-with-resources

* Cleanup - System.lineSeparator

* Cleanup - Reference types to primitives
Some loops over Integers were switched to IntStreams to hopefully cut down on overall boxing.

* Cleanup - Manually filling and copying arrays

* Remove unused imports

* Switch a lambda to a method reference

* Cleanup - CardPredicate Aggregates to method references

* Cleanup - Other static functions to method references

* Cleanup - Ambiguous class reference
Unclear when or how this happened...

* Cleanup - Anonymous -> Method reference

* Cleanup - Anonymous -> Lambda

* Cleanup - Comparator helper methods

* Cleanup - final method in final class

* Cleanup - private final methods

* Remove unused imports

* Convert a couple more lambdas to comparators.

* Simplify creature type list comparison.

---------

Co-authored-by: Jetz <Jetz722@gmail.com>
Co-authored-by: tool4ever <therealtoolkit@hotmail.com>
2024-08-02 08:23:58 +03:00
Chris H
5fc6d38954 Autoclose FileOutputStreams (#5753) 2024-08-01 21:22:40 +03:00
Agetian
c081294f82 - Fix the AI sideboarding mode not loading on startup. 2024-08-01 08:56:50 -04:00
Jetz72
ec9f6e2d2b Added attraction light icons (#5663)
Refactored functional variants to be merged in the card face rather than the card factory
Some variant characteristics now show in deck builder columns
Fixed loading progress amount
"[card] has neither ManaCost nor Color" warning now actually displays when these are missing.

Co-authored-by: Jetz <Jetz722@gmail.com>
Co-authored-by: tool4ever <therealtoolkit@hotmail.com>
2024-07-30 08:28:45 +03:00
Jetz72
3968c7e197 Miscallaneous Cleanup (#5703)
* Cleanup - Unnecessary Boxing

* Cleanup - Unnecessary Unboxing

* Cleanup - For-Each Loops

* Cleanup - `indexOf != -1` -> `contains`

* Cleanup - Merge identical catch blocks

* Cleanup - Try-with-resources

* Cleanup - System.lineSeparator

* Cleanup - Reference types to primitives
Some loops over Integers were switched to IntStreams to hopefully cut down on overall boxing.

* Cleanup - Manually filling and copying arrays

* Remove unused imports

* Switch a lambda to a method reference

---------

Co-authored-by: Jetz <Jetz722@gmail.com>
2024-07-29 17:23:43 +03:00
Chris H
5c55d7b001 Set User agent to modern chrome (#5708) 2024-07-28 12:56:01 +03:00
Chris H
404702c14d Fix preferences for Experimental restore 2024-07-24 11:09:20 -04:00