mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-18 19:58:00 +00:00
* Squashed commit of the following: commit abe8d9bc8ff01eec3da2347e66f8cdc5348a7327 Author: Simisays <67333662+Simisays@users.noreply.github.com> Date: Thu Jan 11 20:26:19 2024 +0100 update commit 16f45e1b1c64b95f7a38d8bb2ca8c2809e260b79 Author: Simisays <67333662+Simisays@users.noreply.github.com> Date: Tue Jan 9 22:00:20 2024 +0100 update commit dd2cf3c0a840920fa9477cd1f85c6047de633a15 Merge: ebe940f020acb5151a82Author: Simisays <67333662+Simisays@users.noreply.github.com> Date: Tue Jan 9 21:04:33 2024 +0100 Merge remote-tracking branch 'upstream/master' into TIBALT commit ebe940f0203de29c4466a3a0f676c409c254387f Author: Simisays <67333662+Simisays@users.noreply.github.com> Date: Tue Jan 9 21:04:24 2024 +0100 update commit 338947f02b7f133b97d2c9eb993423094645e421 Author: Simisays <67333662+Simisays@users.noreply.github.com> Date: Sat Jan 6 16:41:00 2024 +0100 update commit 6328694aaf4311de3160fbd70edd49c1a8a6c289 Merge: 1f0a498b0d94e154fcb8Author: Simisays <67333662+Simisays@users.noreply.github.com> Date: Wed Jan 3 20:21:42 2024 +0100 Merge remote-tracking branch 'upstream/master' into TIBALT commit 1f0a498b0d5bb11655def1a3b8142c9898cb993d Merge: 45b65fa6029a5fe05838Author: Simisays <67333662+Simisays@users.noreply.github.com> Date: Wed Jan 3 20:20:47 2024 +0100 Merge remote-tracking branch 'upstream/master' into TIBALT commit 45b65fa602ed1c5c6a6d65dbc9be89ea8ac636df Author: Simisays <67333662+Simisays@users.noreply.github.com> Date: Wed Jan 3 20:20:37 2024 +0100 update commit f984e00dbc70ab428133337d10f5a1157ef6a333 Merge: acf99e95aabe2f9aa187Author: Simisays <67333662+Simisays@users.noreply.github.com> Date: Fri Dec 29 20:47:36 2023 +0100 Merge remote-tracking branch 'upstream/master' into TIBALT commit acf99e95aae979e9c718809277b455ec12766b33 Author: Simisays <67333662+Simisays@users.noreply.github.com> Date: Fri Dec 29 20:47:31 2023 +0100 update commit a72da3d39a0b837370ef82b07253db1016a24772 Author: Simisays <67333662+Simisays@users.noreply.github.com> Date: Tue Dec 26 21:19:55 2023 +0100 update commit 96d037511f35c6f9c0393b5091b49a030b0ce2f9 Author: Simisays <67333662+Simisays@users.noreply.github.com> Date: Sat Dec 23 18:07:21 2023 +0100 cleanup commit e1271ec1f80918ace004c01b1e1183364c162a21 Merge: 3710aaad6ade851fc749Author: Simisays <67333662+Simisays@users.noreply.github.com> Date: Sat Dec 23 11:38:23 2023 +0100 Merge remote-tracking branch 'upstream/master' into TIBALT commit 3710aaad6a627138ff202b84335ffa4f06a48e4a Author: Simisays <67333662+Simisays@users.noreply.github.com> Date: Sat Dec 23 11:37:59 2023 +0100 Update tibalt.tmx * update * Update skep_outer.tmx * Update enemies.json * More fitting homarid sprite