8902 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Anuken	bcb248907c	Campaign core item incineration + better idle gen	2020-10-10 19:02:47 -04:00
Anuken	ab772d4901	fewer destruction turns	2020-10-10 17:31:16 -04:00
Anuken	7bcecea539	Merge remote-tracking branch 'origin/master'	2020-10-10 17:09:22 -04:00
Anuken	4d889cd8d1	Weather fixes	2020-10-10 17:09:19 -04:00
Anuken	a3e42b28bd	Merge pull request #2821 from summetdev/schems-description ... Descriptions for schematics.	2020-10-10 16:22:00 -04:00
Anuken	c2202a0173	Bugfixes	2020-10-10 15:50:03 -04:00
Anuken	316e6e298c	Fixed #2896	2020-10-10 14:55:21 -04:00
Anuken	8482221c83	.	2020-10-10 14:47:59 -04:00
summetdev	d94fdfa50f	don't show desc at schem save	2020-10-10 20:28:43 +03:00
Anuken	2079a91ac6	Merge remote-tracking branch 'origin/master'	2020-10-10 13:16:03 -04:00
Anuken	d61ad8d2ef	Fixed #2895	2020-10-10 13:15:59 -04:00
Anuken	dbdd1bd87f	Merge pull request #2894 from Quezler/patch-51 ... Who needs two pairs of legs?	2020-10-10 12:50:33 -04:00
Patrick 'Quezler' Mounier	f2bd4bf38c	Who needs two pairs of legs?	2020-10-10 18:35:00 +02:00
Anuken	837a8cecb3	Wave balancing & other tweaks	2020-10-10 12:26:57 -04:00
Anuken	3f74c61c0a	Map center button	2020-10-10 12:05:11 -04:00
Anuken	63bf066cff	Merge remote-tracking branch 'origin/master'	2020-10-10 11:38:05 -04:00
Anuken	fb831e8fef	Better cliff sprites	2020-10-10 11:37:58 -04:00
Anuken	a4306431f0	Merge pull request #2892 from DeltaNedas/storage ... make storageblock instantiable	2020-10-10 11:19:05 -04:00
DeltaNedas	4b9659d4fa	thank you quezler	2020-10-10 12:23:08 +01:00
DeltaNedas	fd71e159d3	make storageblock instantiable	2020-10-10 11:16:04 +01:00
Anuken	5a31d419fc	Bugfixes	2020-10-09 19:10:16 -04:00
Anuken	5455ef4361	CI	2020-10-09 18:49:46 -04:00
Anuken	2a7987d916	CI	2020-10-09 18:35:54 -04:00
Anuken	e4c8366a70	CI	2020-10-09 17:50:23 -04:00
Anuken	e4bf46ab6a	CI	2020-10-09 17:31:53 -04:00
Anuken	03a47baec3	CI	2020-10-09 17:08:58 -04:00
Anuken	4e1b46dda7	CI	2020-10-09 17:08:15 -04:00
Anuken	d21e321c80	CI	2020-10-09 17:03:32 -04:00
Anuken	9f28750063	CI	2020-10-09 16:42:00 -04:00
Anuken	532263b417	Different Android version code system	2020-10-09 16:19:58 -04:00
Anuken	8d738c31e7	arc	2020-10-09 16:17:23 -04:00
Anuken	36463f920d	Signed Android releases, maybe	2020-10-09 15:58:55 -04:00
Anuken	7639f8102f	Bugfixes	2020-10-09 15:34:25 -04:00
Anuken	7da400608c	Bugfixes	2020-10-09 15:18:13 -04:00
Anuken	81633dace4	Merge remote-tracking branch 'origin/master'	2020-10-09 13:52:15 -04:00
Anuken	c78088ab5f	Harder default waves	2020-10-09 13:52:07 -04:00
Anuken	d75be3fcd6	Merge pull request #2888 from Quezler/patch-50 ... Update leak behaviour in plated conduit description	2020-10-09 13:18:11 -04:00
Patrick 'Quezler' Mounier	d776744905	Update leak behaviour in plated conduit description	2020-10-09 19:11:56 +02:00
Anuken	96656bac6b	Bugfixes	2020-10-09 12:59:59 -04:00
Anuken	99539bbab0	Merge remote-tracking branch 'origin/master'	2020-10-09 10:02:12 -04:00
Anuken	22f1c3b2d1	Bugfixes	2020-10-09 10:02:08 -04:00
Anuken	1d34b8474b	Merge pull request #2877 from genNAowl/pierce-cap ... Adds a Pierce Cap Variable	2020-10-09 09:59:53 -04:00
Anuken	ecd152a114	Merge pull request #2882 from Quezler/patch-49 ... Prevent plated conduits from leaking	2020-10-09 09:57:47 -04:00
Anuken	c59263037b	Merge pull request #2879 from Quezler/patch-47 ... Console yes command	2020-10-09 09:46:16 -04:00
Patrick 'Quezler' Mounier	ae9093bfd6	Update ArmoredConduit.java	2020-10-09 10:10:50 +02:00
Patrick 'Quezler' Mounier	f3473e78b4	Update Conduit.java	2020-10-09 10:10:34 +02:00
Patrick 'Quezler' Mounier	1672c70c99	Update BuildingComp.java	2020-10-09 10:07:56 +02:00
Patrick 'Quezler' Mounier	637317f3a5	Add a yes command to the server console	2020-10-09 09:29:37 +02:00
Leonwang4234	e73a813d69	prevent from breaking other things	2020-10-08 19:27:01 -07:00
Leonwang4234	af5fd4551c	true it is	2020-10-08 19:18:53 -07:00