Commit Graph

69000 Commits

Author SHA1 Message Date
Paul Hammerton
65f72b25ed Ban Leyline of Resonance in Arena Standard archive 2024-10-22 16:48:34 +01:00
Agetian
84965594d0 Further improvement to PeekAndRevealAi (fix AI paying 0 for X) (#6410)
* - Add puzzle PS_DSK2.

* - Fix PeekAndRevealAi not paying the X mana cost.

* - Further improvement to PeekAndRevelAi.
2024-10-22 14:07:13 +03:00
Paul Hammerton
9014e282cb Merge pull request #6409 from paulsnoops/edition-updates
Edition updates: FDN, PW24
2024-10-22 11:16:47 +01:00
Paul Hammerton
890c5f0b0d Merge pull request #6407 from Ayora29/fix_token_names
Fix tokens things
2024-10-22 11:11:59 +01:00
Paul Hammerton
e05d0de220 Edition updates: FDN, PW24 2024-10-22 11:11:30 +01:00
tool4ever
031cd4176d Fix logic for Henzie (#6402) 2024-10-22 10:14:43 +02:00
fanch
18b22279df Fix tokens things 2024-10-22 09:59:33 +02:00
tool4ever
9dd712c18c Update experimental_lab_staff_room.txt 2024-10-22 07:51:45 +02:00
kevlahnota
32b209b47b Merge pull request #6405 from kevlahnota/master2
update manifest
2024-10-22 11:47:03 +08:00
Anthony Calosa
c5a01eb5d1 update manifest 2024-10-22 11:34:06 +08:00
kevlahnota
d231af2cad Merge pull request #6404 from kevlahnota/master2
Fix NPE, add manifest entries to jar
2024-10-22 10:59:28 +08:00
Anthony Calosa
bfca273ca6 Merge branch 'master' into master2 2024-10-22 10:58:54 +08:00
Anthony Calosa
5a84c9c4f4 prevent NPE 2024-10-22 10:36:57 +08:00
Anthony Calosa
2aa6d9a6e6 add manifest entries to forge desktop/mobile jar
allow launching the jar without launcher if possible
2024-10-22 10:18:07 +08:00
Chris H
1536868d61 Fix snaps (#6403)
* Update snapshots-pc.yml

* Update snapshots-pc.yml

* Update snapshots-pc.yml
2024-10-21 21:55:05 -04:00
Anthony Calosa
1ab6d82f69 Merge branch 'master' into master2
# Conflicts:
#	.github/workflows/snapshots-pc.yml
2024-10-22 06:49:11 +08:00
Anthony Calosa
5305050546 update snapshot-pc workflow 2024-10-22 06:25:05 +08:00
Anthony Calosa
13f0cda7f6 update snapshot-android workflow 2024-10-22 06:14:09 +08:00
kevlahnota
1a815b4ed7 Merge pull request #6401 from Card-Forge/kevlahnota-patch-3
Update AudioClip.java
2024-10-22 00:21:46 +08:00
kevlahnota
b4bffe93f1 Update AudioClip.java
Surround audio clip with try catch, seems accessing audio in lwjgl3 produce invalidid, could be thread problem.
2024-10-22 00:15:27 +08:00
Anthony Calosa
21a738e616 delete version.txt if res folder is incomplete to allow redownload 2024-10-21 11:16:55 -04:00
Anthony Calosa
993578d695 try to fix permission check 2024-10-21 11:16:55 -04:00
Anthony Calosa
0d06258edb add info on permission 2024-10-21 11:16:55 -04:00
Anthony Calosa
ec9209ceb6 update permission, include shell script to archive 2024-10-21 11:16:55 -04:00
Anthony Calosa
9a36808611 pretty print xml 2024-10-21 11:16:55 -04:00
Anthony Calosa
fbf26efc60 update installer, restore the tar.bz2 archive along with the installer and try to grant permission on the shell executables. 2024-10-21 11:16:55 -04:00
Anthony Calosa
4273420da5 delete version.txt if res folder is incomplete to allow redownload 2024-10-21 22:53:56 +08:00
Anthony Calosa
91cfd1ff3a try to fix permission check 2024-10-21 21:56:23 +08:00
Anthony Calosa
05ce94d36f add info on permission 2024-10-21 20:43:54 +08:00
Anthony Calosa
f3aa3c53ed update permission, include shell script to archive 2024-10-21 20:35:24 +08:00
Anthony Calosa
6e9febdfc7 pretty print xml 2024-10-21 19:41:07 +08:00
Anthony Calosa
995336a764 update installer, restore the tar.bz2 archive along with the installer and try to grant permission on the shell executables. 2024-10-21 19:35:23 +08:00
kevlahnota
2814207390 Merge pull request #6399 from Card-Forge/kevlahnota-patch-2
Update snapshots-pc.yml
2024-10-21 18:14:18 +08:00
kevlahnota
a47d4e6a6c Update snapshots-pc.yml 2024-10-21 18:13:49 +08:00
Agetian
41c64b282a Fix AI paying 0 for PeekAndRevealAi (#6396)
* - Add puzzle PS_DSK2.

* - Fix PeekAndRevealAi not paying the X mana cost.
2024-10-21 12:33:47 +03:00
Anthony Calosa
e9fa2a5fea remove adventure-mac command (-XstartOnFirstThread isn't needed anymore to start on Mac) 2024-10-21 15:26:30 +08:00
Anthony Calosa
ca5b0683d1 update version code, remove redundant CURRENT_VERSION 2024-10-21 15:01:39 +08:00
kevlahnota
ece5772217 Merge pull request #6394 from kevlahnota/master2
fix updater versionstring
2024-10-21 12:58:19 +08:00
Anthony Calosa
59f672225d update 2024-10-21 12:41:26 +08:00
Anthony Calosa
7203eaa07a Merge branch 'master' into master2 2024-10-21 12:19:02 +08:00
Anthony Calosa
f82236cc4f fix updater versionstring 2024-10-21 12:14:17 +08:00
Chris H
2495b02c73 Merge pull request #6393 from Card-Forge/tehdiplomat-patch-4
Update snapshots-pc.yml
2024-10-20 23:08:17 -04:00
Chris H
33c85a4f0f Update snapshots-pc.yml
izpack needs to allow jar files
2024-10-20 23:07:11 -04:00
Chris H
4e48daeadb Merge pull request #6103 from kevlahnota/master2
Update Android build (SDK 35), Java 17, LibGDX 1.13.0
2024-10-20 22:55:10 -04:00
Anthony Calosa
1979c23389 update pom 2024-10-21 09:15:57 +08:00
Anthony Calosa
612473c1fb fix adventure-editor pom 2024-10-21 09:13:45 +08:00
Anthony Calosa
e833b9f400 use flatten plugin 2024-10-21 00:03:42 +08:00
Anthony Calosa
9cf06a04da remove slf4j-simple 2024-10-20 22:23:01 +08:00
Anthony Calosa
7bebf8732c Merge branch 'master' into master2 2024-10-20 21:56:30 +08:00
Anthony Calosa
5a1f864db0 fix dependency conflict 2024-10-20 21:19:13 +08:00