5211 Commits

Dieser Branch

Dieser Branch

Alle Branches

Autor	SHA1	Nachricht	Datum
Jesse Boyd	be8213d8ee	resolve conflicts	2019-07-18 16:56:57 +10:00
Kenzie Togami	8975347703	Fix Forge regen, by retaining the world reference. Also close the world.	2019-07-17 18:02:45 -07:00
Jesse Boyd	dd38cbe750	.	2019-07-18 04:30:02 +10:00
Jesse Boyd	ff94a1e5ed	8108d0a9	2019-07-18 04:24:21 +10:00
Jesse Boyd	905fbf5a0b	8108d0a9	2019-07-18 02:31:13 +10:00
Jesse Boyd	1d413cde76	BrushTool typo	2019-07-17 10:56:28 -04:00
Jesse Boyd	8d60c0197b	Update AsyncChunk.java	2019-07-17 22:09:48 +10:00
Jesse Boyd	7a42bd208f	Update AsyncWorld.java	2019-07-17 22:04:05 +10:00
Jesse Boyd	505af853bd	setLocation should be synchronized	2019-07-17 22:00:00 +10:00
Jesse Boyd	eff203c3b8	Merge branch 'breaking' into breaking-114	2019-07-17 21:31:06 +10:00
Jesse Boyd	8f902c797d	Don't print within high stack depth conditions ... FAWE is trying to detect prevent a stackoverflow from block/item lag. Calling print adds to the stack depth.	2019-07-17 21:28:46 +10:00
Jesse Boyd	68ea3d6e99	revert some changes	2019-07-17 20:50:54 +10:00
Jesse Boyd	08dead5a86	cleanup build script	2019-07-17 19:43:14 +10:00
Jesse Boyd	2da3367f3d	Switch	2019-07-17 16:21:30 +10:00
Jesse Boyd	3113d8dd69	Optional	2019-07-17 16:11:55 +10:00
Jesse Boyd	cedb261313	fix some Command annotations	2019-07-17 15:43:18 +10:00
Jesse Boyd	ae9efc3df1	Merge branch 'breaking-114' into filter-pipeline	2019-07-17 14:55:04 +10:00
MattBDev	0e54f196fc	Deleted a class and work on generation commands	2019-07-16 23:57:35 -04:00
MattBDev	8108d0a936	Major command changes that don't work yet.	2019-07-16 23:44:34 -04:00
wizjany	05cee0a30b	Don't overwrite history during changes. ... Fixes issues with some changes not being undone. I mean, the sphere algorithm needs to not set blocks 20 times, but other things can trigger this too. Also allow radius 0 sphere via //sphere (because /br sphere allows it).	2019-07-16 21:43:14 -04:00
wizjany	f75104f2ac	Actually use fixed IDs in MCEdit reader. ... Fixes WORLDEDIT-3947.	2019-07-16 19:45:27 -04:00
Jesse Boyd	48356275af	fix loading legacy biomes	2019-07-17 06:36:48 +10:00
Jesse Boyd	5d41bdb7c7	merge from breaking	2019-07-17 06:10:18 +10:00
Jesse Boyd	71a9256617	Merge branch 'breaking' into breaking-114	2019-07-17 06:08:18 +10:00
Jesse Boyd	75f059fdc5	check length, not null	2019-07-17 05:28:55 +10:00
Jesse Boyd	b3e11d2094	patch for missing tile position data	2019-07-17 05:16:08 +10:00
Jesse Boyd	cfbde956f4	some refactoring to pipeline classes (WIP)	2019-07-17 05:10:39 +10:00
Kenzie Togami	6e90c59136	Merge pull request #504 from EngineHub/feature/junit-5 ... Switch to JUnit 5	2019-07-16 04:21:06 -07:00
Kenzie Togami	c1f4eecd77	Narrow timeout test exception type	2019-07-15 17:18:10 -07:00
Kenzie Togami	5c5c822f4b	Replace try-fail-catch-assert with assertThrows	2019-07-15 16:38:34 -07:00
Kenzie Togami	3b157b67c3	Move Bukkit to JUnit 5	2019-07-15 16:38:33 -07:00
Kenzie Togami	429d022752	Move Core to JUnit 5	2019-07-15 16:38:33 -07:00
Kenzie Togami	e98b99edcd	Properly acquire JUnit 4, drop json-simple	2019-07-15 16:38:33 -07:00
Kenzie Togami	bcea78c701	Merge pull request #503 from EngineHub/feature/kotlin-dsl-gradle-scripts ... Kotlin DSL Gradle Scripts	2019-07-15 14:17:51 -07:00
Kenzie Togami	5fa311be48	Account for IntelliJ bug	2019-07-15 09:42:28 -07:00
Kenzie Togami	ad5dcbea58	Attempt to fix ASM conflict	2019-07-15 09:14:02 -07:00
Kenzie Togami	98e29f634f	Fix fabric output jar	2019-07-14 00:00:11 -07:00
Kenzie Togami	58863c22e8	Try downgrading fabric	2019-07-13 23:26:31 -07:00
Kenzie Togami	52a62b984b	Improve logging, update to 5.5.1	2019-07-13 22:16:16 -07:00
Kenzie Togami	5277f99bf2	Minor fixes for craftscripts in Forge	2019-07-12 13:49:45 -07:00
Kenzie Togami	5a14693aa9	Migrate Sponge, Libs to Kotlin DSL	2019-07-12 13:49:45 -07:00
Kenzie Togami	3bdc1c1cf2	Fixup after shade rhino merge	2019-07-12 13:49:45 -07:00
Kenzie Togami	3d4025c757	Migrate Forge to Kotlin DSL	2019-07-12 13:49:45 -07:00
Kenzie Togami	47b9716bdc	Migrate Fabric to Kotlin DSL	2019-07-12 13:49:45 -07:00
Kenzie Togami	55100761a3	Migrate Core to Kotlin DSL	2019-07-12 13:49:45 -07:00
Kenzie Togami	ab8397e517	Migrate Bukkit to Kotlin DSL	2019-07-12 13:49:45 -07:00
Kenzie Togami	19802e478c	Re-write root and libs to Kotlin DSL	2019-07-12 13:49:45 -07:00
Kenzie Togami	eccbad92e8	Move away from deprecation, move dependencies towards buildSrc	2019-07-12 13:49:45 -07:00
Kenzie Togami	59c2a15cda	Further minor cleanup from Gradle 5 change	2019-07-12 13:49:45 -07:00
Kenzie Togami	4874c314d0	Merge pull request #501 from EngineHub/feature/gradle-5 ... Update to Gradle 5	2019-07-11 22:01:09 -07:00