1557 Commits

Author	SHA1	Message	Date
ProfElements	23049b64fa	Make request changes, simpliflied BookBinder	2021-01-13 15:25:28 -06:00
ProfElements	088a08952b	Make requested changes, made combineEnchantments better generally	2021-01-13 14:35:17 -06:00
ProfElements	93997718c0	Make requested changes, removed redundant isCompatible, and make isCompatible return false on else instead of just after the if	2021-01-09 15:25:59 -06:00
ProfElements	23d0f0ae2a	Made requested changes.	2021-01-07 14:41:59 -06:00
ProfElements	b26376078e	Made requested changes. Defaulted has-custom-level to false because no-bypass is true	2021-01-06 16:03:44 -06:00
ProfElements	4eda0923bf	Make all ItemSettings reasonable values	2021-01-04 14:14:30 -06:00
ProfElements	685614803c	Add ItemSettings, hasCustomMaxLevel, customMaxLevel. Bypasses vanilla but not a custom defined max	2021-01-03 13:53:43 -06:00
ProfElements	62f0019a7f	Lower time requirement to deal with large enchantments books (>4 enchantments)	2021-01-03 12:36:08 -06:00
ProfElements	fe8b0c21f7	Fixed code inconsistencies	2021-01-03 12:35:00 -06:00
ProfElements	c162e5194d	Merge branch 'master' into master	2021-01-03 05:10:28 +00:00
ProfElements	a42af430e3	Add deniesVanillaRules ItemSetting, this can make the Book Binder adhere to vanilla rules	2021-01-02 22:50:48 -06:00
ProfElements	b23869f037	Added Book Binder	2021-01-02 22:26:59 -06:00
TheBusyBiscuit	c637b2fd0c	[CI skip] Updated translators list	2021-01-02 20:43:29 +01:00
TheBusyBiscuit	df2dce0c95	[CI skip] Updated translators list	2021-01-02 20:35:54 +01:00
TheBusyBiscuit	f2dd3a0125	Fixes #2655	2020-12-31 17:38:51 +01:00
TheBusyBiscuit	aa98bd0ba2	Fixes #2664	2020-12-31 17:08:50 +01:00
Daniel Walsh	9c31c746dd	Requested changes	2020-12-23 22:16:45 +00:00
Daniel Walsh	6cf2051e60	Panda smells	2020-12-23 14:56:51 +00:00
Daniel Walsh	00c233dee5	Move to a method	2020-12-23 14:32:47 +00:00
Daniel Walsh	2872cf8a2e	Fixed #2647	2020-12-23 14:17:35 +00:00
Patbox	d7a8903211	Temponary fix for #2636	2020-12-19 16:30:38 +01:00
TheBusyBiscuit	f755e943c4	[CI skip] Refactoring and code cleanup	2020-12-17 18:30:51 +01:00
TheBusyBiscuit	2ced45b485	Merge pull request #2609 from Slimefun/refactoring/third-party-integrations ... Refactored integrations (+ Fixed #2575)	2020-12-17 15:30:16 +01:00
TheBusyBiscuit	e6114f7e4b	[CI skip] Updated translators list	2020-12-17 13:33:23 +01:00
TheBusyBiscuit	3d54080001	[CI skip] A bit o refactoring	2020-12-12 14:00:11 +01:00
TheBusyBiscuit	498da0e00a	[CI skip] Merge pull request #2598 from Slimefun/feature/bee-armor ... Added Bee Armor	2020-12-11 13:05:20 +01:00
Senne Van Rompaey	3acd6926ad	Merge branch 'master' into refactoring/third-party-integrations	2020-12-10 22:02:21 +01:00
Patbox	28e5771ca8	Implement more suggestions	2020-12-10 12:38:31 +01:00
TheBusyBiscuit	36be4c29de	More refactoring	2020-12-09 13:33:34 +01:00
TheBusyBiscuit	7d9e726102	More refactoring	2020-12-09 12:39:24 +01:00
TheBusyBiscuit	88c81a9cc2	Added ItemsAdder support (fixes #2575)	2020-12-09 11:41:59 +01:00
TheBusyBiscuit	2e13cd2e88	Refactoring for third-party integrations	2020-12-08 21:07:48 +01:00
TheBusyBiscuit	56316426aa	Updated to latest Slimefun version	2020-12-05 21:50:46 +01:00
TheBusyBiscuit	bd213a7789	No idea what that was doing here...	2020-12-05 21:45:42 +01:00
TheBusyBiscuit	9504e523f4	Merge branch 'master' into feature/bee-armor	2020-12-05 21:43:40 +01:00
Patbox	7afb9b9791	Implement more suggestions	2020-12-05 20:51:30 +01:00
Patbox	ff634c0f5c	Make code better	2020-12-05 20:22:03 +01:00
Patbox	f4633c528f	Fix ghost blocks	2020-12-05 17:48:17 +01:00
TheBusyBiscuit	5d15a7e5cf	Another small change	2020-12-03 10:38:03 +01:00
TheBusyBiscuit	e1a3bf730b	Made requested changes	2020-12-03 10:34:05 +01:00
TheBusyBiscuit	90df68b0e0	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into optimization/cargo-filters	2020-12-03 10:23:18 +01:00
TheBusyBiscuit	96e38608f9	Added 4 bricks -> 1 brick block recipe to the Electric Press	2020-12-01 16:37:51 +01:00
TheBusyBiscuit	5d0ed3570d	Fixes #2583	2020-12-01 16:12:57 +01:00
TheBusyBiscuit	ac7bb44d98	Fixes #2585	2020-12-01 11:46:59 +01:00
TheBusyBiscuit	b4edc6c5bf	Fixes #2496	2020-11-30 17:39:31 +01:00
TheBusyBiscuit	1d4cb85cb1	Fixes #2576	2020-11-30 17:03:17 +01:00
TheBusyBiscuit	c4619ecbaa	Fixes #2574	2020-11-30 15:13:53 +01:00
TheBusyBiscuit	3e645a148f	Refactoring	2020-11-26 18:21:10 +01:00
TheBusyBiscuit	d0e7e21877	Performance and memory improvements	2020-11-25 14:27:46 +01:00
TheBusyBiscuit	925cb9d0d1	[Ci skip] A small code improvement	2020-11-23 18:37:20 +01:00