176 Commits

Author	SHA1	Message	Date
TheBusyBiscuit	bb764b7584	Fixed Guide Settings showing "last activity" as a negative number	2020-11-19 21:00:28 +01:00
TheBusyBiscuit	7e657c9810	A ton of performance improvements	2020-11-19 17:42:10 +01:00
TheBusyBiscuit	1c5f2f650b	Some refactoring and small fixes	2020-11-02 15:10:56 +01:00
TheBusyBiscuit	12e7205280	[Ci skip] Added some unit tests	2020-10-28 12:52:23 +01:00
TheBusyBiscuit	b3befbda49	Some code cleanup, documentation and paper optimizations	2020-10-28 00:44:35 +01:00
TheBusyBiscuit	7f9bed54ff	Added some documentation and two guide item ui ids	2020-10-25 11:54:45 +01:00
TheBusyBiscuit	1998c7746f	Merge pull request #2477 from J3fftw1/fix/#2470 ... fixes #2470	2020-10-18 19:22:04 +02:00
Panda.com	e3df3ab012	added tall_flowers.json and requested changes	2020-10-18 15:47:47 +02:00
Panda.com	dc025c7b28	fix	2020-10-18 14:31:54 +02:00
TheBusyBiscuit	734b853eb7	[CI skip] Reduced technical debt	2020-10-18 13:53:15 +02:00
Panda.com	3d364ee331	did requested changes	2020-10-18 13:48:38 +02:00
TheBusyBiscuit	e054fe6682	Fixes #2448	2020-10-18 13:17:18 +02:00
TheBusyBiscuit	4aff61f3b1	Removed 1.13 support	2020-10-17 12:54:36 +02:00
TheBusyBiscuit	8440143f41	Refactoring	2020-10-14 13:20:12 +02:00
TheBusyBiscuit	9b1d6367b3	Some lore changes	2020-10-12 16:01:27 +02:00
TheBusyBiscuit	87d319cd02	Merge pull request #2382 from LinoxGH/EnergyConnector ... Energy Connectors	2020-10-12 15:49:50 +02:00
TheBusyBiscuit	df4a87d9fa	[Ci skip] A little bit of refactoring	2020-10-11 15:41:42 +02:00
LinoxGH	ad505b6cef	Merge branch 'master' into EnergyConnector	2020-10-11 00:26:43 +03:00
TheBusyBiscuit	a44f2fa626	[CI skip] Some cleanup	2020-10-10 20:46:17 +02:00
LinoxGH	973f92c979	Update HeadTexture.java ... I guess this is correct now.	2020-10-10 15:33:41 +03:00
TheBusyBiscuit	fd123b0bc2	[CI skip] Added another validation to head textures, looks at Linox	2020-10-10 14:22:14 +02:00
LinoxGH	729facab61	Added Energy Connector texture.	2020-10-10 15:18:55 +03:00
TheBusyBiscuit	f895adde61	[CI skip] Reduced technical debt	2020-10-10 14:17:05 +02:00
TheBusyBiscuit	83e8010e29	Lots of refactoring	2020-10-09 17:39:21 +02:00
TheBusyBiscuit	126ccf3d01	Formatting	2020-10-07 18:43:55 +02:00
TheBusyBiscuit	7c3fc99b3a	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into ... tags Conflicts: src/main/java/io/github/thebusybiscuit/slimefun4/api/items/ItemSetting.java src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/ProgrammableAndroid.java src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/IndustrialMiner.java src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/ExplosiveTool.java src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PickaxeOfVeinMining.java src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/items/implementations/tools/TestClimbingPick.java	2020-10-07 18:38:26 +02:00
TheBusyBiscuit	e4ddc7c452	[CI skip] Enforce OTBS.	2020-10-07 18:27:01 +02:00
TheBusyBiscuit	b32dc0b727	@poma123 for the rescue	2020-10-04 13:40:41 +02:00
TheBusyBiscuit	655b429f0d	Added a new super tag	2020-10-04 13:31:52 +02:00
TheBusyBiscuit	8bbdc37130	Refactored Climbing Picks and added Tags	2020-10-04 02:28:59 +02:00
TheBusyBiscuit	e1a8c6f52e	Added caveman talisman tag	2020-10-03 22:21:01 +02:00
LinoxGH	50e48ed87c	Merge branch 'master' into tags	2020-10-01 21:42:50 +03:00
TheBusyBiscuit	fda74388a6	[CI skip] Internal changes to custom model data	2020-09-30 11:59:55 +02:00
TheBusyBiscuit	a674a38f2a	Merge branch 'master' into tags	2020-09-28 15:07:29 +02:00
TheBusyBiscuit	99e46fcb2a	[CI skip] Relocated and documented two methods	2020-09-22 19:39:06 +02:00
TheBusyBiscuit	2f37c2b8b7	Merge branch 'master' into tags	2020-09-21 13:24:44 +02:00
TheBusyBiscuit	749bb972a3	[CI skip] Added a few more annotations	2020-09-19 11:51:02 +02:00
TheBusyBiscuit	23bf314905	Added fluid-sensitive tag	2020-09-19 11:39:35 +02:00
TheBusyBiscuit	b14f0b76c0	Added unbreakable tag	2020-09-13 12:00:45 +02:00
TheBusyBiscuit	a770378025	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags	2020-09-13 11:57:11 +02:00
Silent	03f7e64107	Fixed colors & functionality of cheat sheet	2020-09-12 15:19:07 +02:00
poma123	be5f793695	Fixed a bunch of typos	2020-09-11 20:02:17 +02:00
TheBusyBiscuit	74edbe499c	Fixes #2238	2020-09-11 00:07:26 +02:00
TheBusyBiscuit	8a3165e9ba	Fixed some tags and added glass	2020-09-10 00:33:47 +02:00
TheBusyBiscuit	9655761ab1	Micro-optimizations Walshy would be proud of	2020-09-09 15:43:44 +02:00
TheBusyBiscuit	035e35a067	Implemented tags in more occurences	2020-09-09 15:34:58 +02:00
TheBusyBiscuit	7fdf10cc8b	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into ... tags Conflicts: src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PickaxeOfVeinMining.java	2020-09-08 12:37:25 +02:00
Daniel Walsh	53dea5e195	Some good old micro-optimisations	2020-09-07 22:38:23 +01:00
TheBusyBiscuit	3220a124aa	Added more Unit Tests	2020-09-07 12:41:04 +02:00
TheBusyBiscuit	5b72faddc3	Implemented tags	2020-09-07 11:08:39 +02:00