66 Commits

Author	SHA1	Message	Date
SquidDev	92567b4d7e	Merge branch 'master' into mc-1.14.x	2019-11-29 20:23:56 +00:00
SquidDev	642351af1a	Merge branch 'master' into mc-1.14.x	2019-11-25 09:15:20 +00:00
SquidDev	3ea2d6a0a8	Merge branch 'master' into mc-1.14.x	2019-10-04 19:56:49 +01:00
SquidDev	81f85361d5	Move Lua files to the correct location ... I really need to fix this.	2019-10-01 19:43:03 +01:00
SquidDev	d4f6a594b6	Merge branch 'master' into mc-1.14.x	2019-10-01 18:58:40 +01:00
SquidDev	07a56454a0	Bumpity bumpity bump	2019-08-09 09:38:30 +01:00
SquidDev	08d22fd3df	Fix changelog being out-of-sync	2019-08-04 11:05:14 +01:00
SquidDev	e6c691a8f8	Fix rom's location ... This isn't going to get annoying or anything	2019-08-04 11:02:07 +01:00
SquidDev	4b0e5c445c	Merge branch 'master' into mc-1.14.x	2019-08-04 10:57:20 +01:00
SquidDev	57318b022d	Merge branch 'master' into mc-1.14.x	2019-06-15 08:00:20 +01:00
SquidDev	0f3c44c926	Merge branch 'master' into mc-1.13.x	2019-06-08 08:21:08 +01:00
SquidDev	b6715bd812	Fix a couple of build failures	2019-06-02 18:36:34 +01:00
SquidDev	c82d8a7c2a	Merge branch 'master' into mc-1.13.x	2019-06-02 16:46:45 +01:00
SquidDev	220e4bd660	Merge branch 'master' into mc-1.13.x	2019-04-24 10:15:33 +01:00
SquidDev	810258e9b8	Update and rename all resources ... - Languages are converted to JSON - Rename most *(_advanced) blocks to *_{advanced,normal}. It's more verbose, but means they're sorted together. - A couple of changes to the ROM to work with some Java changes. - Update recipes and advancements to not use damage values.	2019-04-02 13:18:43 +01:00
SquidDev	5e462adc5c	Relocate all resource files ... - textures/{block,item}s -> textures/{block,item} - assets/*/{advancements,lua,recipes} -> data/*/...	2019-04-02 13:18:43 +01:00