420 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
tooomm	4db482a3c8	Merge branch 'master' into tooomm-patch-5	2021-07-21 14:33:23 +02:00
tooomm	8a048f0770	CI: fix syntax (#278)	2021-07-21 14:23:21 +02:00
tooomm	4dc0fb8761	CI: upload artifacts for easy reviewing (#276)	2021-07-21 13:44:03 +02:00
tooomm	15ae2677cd	+	2021-07-15 20:34:57 +02:00
tooomm	ff54e754c8	re-add xml version and encoding information	2021-07-15 20:27:58 +02:00
ebbit1q	d365ca0375	move settings info to a more visible location (#274) ... * move settings info to a more visible location * put in quotes Co-authored-by: tooomm <tooomm@users.noreply.github.com>	2021-07-14 12:05:00 +02:00
Zach H	bb2d56df14	Merge pull request #273 from ebbit1q/patch-1 ... use tilde (`~`) as the SPOILER_MARKER instead	2021-05-27 18:48:44 -04:00
ebbit1q	26e1e22ad0	use tilde (~) as the SPOILER_MARKER instead ... * is apparently not allowed as a filename on windows	2021-05-28 00:43:26 +02:00
Zach H	4ea02869be	Merge pull request #272 from ebbit1q/fixes ... quick improvements to spoilers	2021-05-27 17:39:09 -04:00
ebbit1q	31ba735d95	add asterisk to spoiler set codes ... this will make them not use the same location on disk anymore so people will complain less about keeping spoiler card art when they don't clear their image cache people should still clear their image cache this is a workaround, a nicer solution should be implemented in cockatrice sometime	2021-05-27 23:23:34 +02:00
ebbit1q	0f4ec17eb6	remove control characters from xml	2021-05-27 23:23:10 +02:00
ebbit1q	103279671d	add include/ to gitignore	2021-05-27 23:22:36 +02:00
Zach H	64c7ba430f	Merge pull request #270 from ebbit1q/inactive_spoilers ... fix exception when spoiler season is inactive	2021-04-30 02:14:41 -04:00
ebbit1q	4b25618657	fix exception when spoiler season is inactive	2021-04-30 00:32:43 +02:00
Zach H	c24ab7574d	Merge pull request #265 from ebbit1q/xml_escapes ... escape some xml values	2021-01-16 22:47:18 -05:00
ebbit1q	b5d1d938a8	add -p to all mkdirs	2021-01-17 04:44:52 +01:00
ebbit1q	a242ebb1d1	escape some xml values	2021-01-17 04:39:36 +01:00
Zach H	a73195f022	Merge pull request #264 from ebbit1q/languageisaverytrickythingsomesentencescanbeinterpretedindifferentways ... correctly compare the output of the python script in the github workflow	2021-01-16 21:29:47 -05:00
ebbit1q	fd65e743cc	the suggested changes	2021-01-17 01:27:31 +01:00
Zach H	5dd5d37680	Merge pull request #260 from Cockatrice/tooomm-patch-3 ... More GH Actions stuff	2021-01-16 12:05:02 -05:00
tooomm	7c791d4f01	step names	2020-12-04 17:48:59 +01:00
Zach H	9e73420094	Merge pull request #263 from ebbit1q/tooomm-patch-3 ... remove deploy.sh use output instead of exit code	2020-12-04 01:12:07 -05:00
ebbit1q	9481e5ff24	correctly check output ... true != 'true'	2020-12-04 03:09:55 +01:00
ebbit1q	91a615f77d	do not run the scheduled run on forks	2020-12-04 01:44:55 +01:00
ebbit1q	37f2d8e19b	remove deploy.sh use output instead of exit code	2020-12-03 23:41:19 +01:00
tooomm	db458c19b7	last travis pieces	2020-12-03 21:43:52 +01:00
tooomm	7287cb5fbc	format	2020-12-03 21:37:10 +01:00
tooomm	7a138354f4	remove warning	2020-12-03 21:11:55 +01:00
tooomm	da60525795	fix	2020-12-02 22:48:07 +01:00
tooomm	a4bdf439ec	one more warning	2020-12-02 20:39:05 +01:00
tooomm	aec3dd7618	remove deploy key ... See #258	2020-12-02 20:24:18 +01:00
tooomm	8cfbdb7d87	add more context to warning	2020-12-01 11:37:45 +01:00
tooomm	7fb119e52e	add ability to run manually from gui	2020-12-01 11:24:40 +01:00
tooomm	9f3d1839e9	Update README.md	2020-12-01 11:22:51 +01:00
tooomm	ce18105f1f	add GH Actions badge	2020-12-01 11:20:48 +01:00
Zach H	e49f6a46cd	Merge pull request #259 from ebbit1q/github_actions ... forgot double colons	2020-12-01 00:41:59 -05:00
ebbit1q	a1e2ac1893	forgot double colons	2020-12-01 06:39:10 +01:00
Zach H	eeb03ff0cd	Merge pull request #258 from ebbit1q/github_actions ... move to github actions	2020-12-01 00:33:16 -05:00
ebbit1q	b29407d718	move to github actions	2020-12-01 06:26:27 +01:00
Zach H	f34decf10a	Merge pull request #254 from Cockatrice/tooomm-patch-1 ... README: add discord badge	2020-10-14 11:18:13 -04:00
tooomm	33896b5a78	add discord badge	2020-10-14 16:55:57 +02:00
ZeldaZach	54fc3aae83	Minor fix for image ... Signed-off-by: ZeldaZach <zahalpern+github@gmail.com>	2020-09-08 14:07:15 -04:00
ZeldaZach	69fac381f9	Fix Zendikar issues ... Signed-off-by: ZeldaZach <zahalpern+github@gmail.com>	2020-09-03 02:11:17 -04:00
tooomm	a54349b037	Update README.md	2020-02-07 02:37:44 +01:00
tooomm	4458316d62	add badge with card count (#248)	2019-10-24 12:49:33 +02:00
tooomm	c136e4122e	adjust hint phrasing	2019-09-11 13:39:11 +02:00
tooomm	f4e6d80e89	show release dates in readme	2019-09-11 13:36:13 +02:00
Zach H	66b2ff35cc	Merge pull request #244 from Cockatrice/tooomm-patch-3 ... Add warning hint	2019-07-01 16:45:03 -04:00
tooomm	65d4d5afdb	add warning hint	2019-07-01 22:41:19 +02:00
tooomm	c0a584bfbd	remove spoiler tag again	2019-07-01 21:57:13 +02:00