external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
61,434 Commits 32 Branches 187 Tags
e9d85ff0d1d0affea1e9ab8ecbd61f1ad509b10c
Commit Graph

61434 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simisays
55cd685f54 Update canoptek_scarab_swarm.txt 2022-09-16 23:09:07 +02:00
Simisays
45b77e09d3 Update aspiring_champion.txt 2022-09-16 22:35:56 +02:00
Simisays
707e7ce6e7 Update c_1_1_insect_artifact_flying.txt 2022-09-16 22:12:27 +02:00
Simisays
65486e81f1 Update canoptek_tomb_sentinel.txt 2022-09-16 22:11:51 +02:00
Simisays
acbe1c89ff Update canoptek_spyder.txt 2022-09-16 22:11:14 +02:00
Simisays
1c78f799e2 Update canoptek_scarab_swarm.txt 2022-09-16 22:10:29 +02:00
Simisays
70e5409597 Update bloodthirster.txt 2022-09-16 22:09:41 +02:00
Simisays
caae27144e Update biotransference.txt 2022-09-16 22:09:02 +02:00
Simisays
10e83e0cc9 Update aspiring_champion.txt 2022-09-16 22:08:25 +02:00
Simisays
4aa33f8d53 update 2022-09-16 22:06:41 +02:00
Simisays
6156454f77 Create canoptek_spyder.txt 2022-09-16 21:34:17 +02:00
Simisays
c1ede1f43b update 2022-09-16 21:28:05 +02:00
Simisays
2e3632441f update 2022-09-16 20:59:12 +02:00
Simisays
9dc796b5dc update 2022-09-16 20:44:20 +02:00
Grimm
fbd888f290 Merge branch 'master' of https://github.com/Card-Forge/forge into adventure 
 Conflicts:
	forge-gui-mobile/src/forge/adventure/scene/DeckSelectScene.java
	forge-gui-mobile/src/forge/adventure/scene/HudScene.java
	forge-gui-mobile/src/forge/adventure/scene/PlayerStatisticScene.java
	forge-gui-mobile/src/forge/adventure/scene/RewardScene.java
	forge-gui-mobile/src/forge/adventure/scene/SaveLoadScene.java
	forge-gui-mobile/src/forge/adventure/scene/SettingsScene.java
	forge-gui-mobile/src/forge/adventure/scene/StartScene.java
	forge-gui-mobile/src/forge/adventure/scene/UIScene.java
	forge-gui-mobile/src/forge/adventure/stage/GameHUD.java
	forge-gui-mobile/src/forge/adventure/stage/GameStage.java
	forge-gui-mobile/src/forge/adventure/stage/MapStage.java
	forge-gui-mobile/src/forge/adventure/stage/WorldStage.java
 2022-09-16 18:35:47 +02:00
Grimm
0777d84325 Merge remote-tracking branch 'origin/adventure' into adventure 
# Conflicts:
#	forge-gui-mobile/src/forge/adventure/world/World.java
#	forge-gui/res/adventure/Shandalar/world/tilesets/autotiles.png
#	forge-gui/res/adventure/Shandalar/world/tilesets/structures.png
 2022-09-16 18:14:39 +02:00
Grimm
5bae834f09 Render world map with more details 
Changed SpellSmithScene to not display empty edition and fixed edition filter.
 2022-09-16 18:13:13 +02:00
Paul Hammerton
6f64c7851d Merge pull request #1532 from paulsnoops/edition_updates 
Update editions, DMU rankings and TypeLists (for 40k)
 2022-09-16 08:19:28 +01:00
paulsnoops
904a98a1bf update dmu draft 2022-09-16 08:16:34 +01:00
paulsnoops
0dd2efe2f5 Update editions and TypeLists.txt 2022-09-16 08:09:13 +01:00
Simisays
91d227e910 Update tyranid_invasion.txt 2022-09-16 08:41:28 +02:00
Simisays
56272e3752 Update malanthrope.txt 2022-09-16 08:40:45 +02:00
Simisays
ab34e089ed Update lictor.txt 2022-09-16 08:40:32 +02:00
Anthony Calosa
a4bacaef52 Merge pull request #1527 from Northmoc/1520 
fixes for 40k cards
 2022-09-16 10:34:20 +08:00
Grimm
b61a48514e Render world map with more details 
Changed SpellSmithScene to not display empty edition and fixed edition filter.
 2022-09-16 02:28:43 +02:00
Northmoc
d7a51ece0e Squad keyword and vanguard_suppressor.txt 2022-09-15 20:15:56 -04:00
Simisays
1921c0861b Update winged_hive_tyrant.txt 2022-09-15 21:32:53 +02:00
Simisays
d2c9456bac Update lictor.txt 2022-09-15 21:23:09 +02:00
Simisays
ef4836ca10 Update keeper_of_secrets.txt 2022-09-15 21:22:28 +02:00
Simisays
ed915e3650 Update malanthrope.txt 2022-09-15 21:21:12 +02:00
Simisays
3c331ca854 update 2022-09-15 21:17:40 +02:00
Simisays
7f26bf79e4 update 2022-09-15 21:11:45 +02:00
Simisays
53711512e6 update 2022-09-15 21:04:21 +02:00
Simisays
c6bc55ea9e update 2022-09-15 20:55:09 +02:00
Simisays
2cfe56a967 update 2022-09-15 20:27:24 +02:00
Simisays
b0882d64a9 update 2022-09-15 20:15:06 +02:00
Simisays
3fae821354 Update winged_hive_tyrant.txt 2022-09-15 20:10:01 +02:00
Simisays
624f9ae2c8 update 2022-09-15 20:01:36 +02:00
Simisays
253f6a7e5d Update genestealer_patriarch.txt 2022-09-15 19:58:44 +02:00
Simisays
1e4c2707f1 Update haruspex.txt 2022-09-15 19:49:59 +02:00
Simisays
82b89f9633 Update the_red_terror.txt 2022-09-15 19:48:01 +02:00
Simisays
b3788ce84c Update the_red_terror.txt 2022-09-15 19:47:46 +02:00
Simisays
f81c391f26 Update old_one_eye.txt 2022-09-15 19:46:37 +02:00
Simisays
eba7837c0e Update nexos.txt 2022-09-15 19:45:36 +02:00
Simisays
0e13f289cb Update genestealer_patriarch.txt 2022-09-15 19:45:20 +02:00
Simisays
8f4c873d8e Update haruspex.txt 2022-09-15 19:44:19 +02:00
Simisays
57c832b854 Update genestealer_patriarch.txt 2022-09-15 19:42:38 +02:00
Simisays
60bcccc55b Update genestealer_patriarch.txt 2022-09-15 19:42:19 +02:00
Simisays
035c3ce147 Update genestealer_patriarch.txt 2022-09-15 19:41:58 +02:00
Simisays
c1a1a6a139 Update genestealer_locus.txt 2022-09-15 19:41:05 +02:00