1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00
Commit Graph

522 Commits

Author SHA1 Message Date
TheBusyBiscuit
7eff4d381e Fixed a small issue with backpacks 2021-01-17 14:27:01 +01:00
TheBusyBiscuit
16ed670573 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
refactoring/holograms

Conflicts:
	CHANGELOG.md
2021-01-16 15:56:23 +01:00
TheBusyBiscuit
0feace9c06
Merge pull request #2729 from Slimefun/fix/infused-hopper-picking-up-incorrect-items
Fix the infused hopper picking up items with pickup delay Short.MAX_VALUE
2021-01-16 15:51:17 +01:00
TheBusyBiscuit
03b4c10bad [CI skip] Updated changelog 2021-01-16 14:46:00 +01:00
TheBusyBiscuit
34d18c5547
Merge branch 'master' into refactoring/holograms 2021-01-16 11:34:24 +01:00
Daniel Walsh
55d2f82dcd
Merge branch 'master' into fix/infused-hopper-picking-up-incorrect-items 2021-01-16 10:33:16 +00:00
TheBusyBiscuit
7c929a2f22 Fixes #2728 2021-01-16 11:30:39 +01:00
Daniel Walsh
5c2a2faa79
Add to changelog 2021-01-16 10:30:31 +00:00
TheBusyBiscuit
e523d7849e Fixes #2662 2021-01-16 11:28:38 +01:00
TheBusyBiscuit
a810458345 [CI skip] Small changes 2021-01-15 11:46:40 +01:00
TheBusyBiscuit
3663a7d43b Proper error handling and updated changelog 2021-01-15 03:31:33 +01:00
TheBusyBiscuit
ac590fdde3 Fixes #2721 2021-01-14 14:41:09 +01:00
TheBusyBiscuit
7826b2359a Finished fix for #2636 and fixed a threading issue with BlockStates 2021-01-14 11:58:52 +01:00
TheBusyBiscuit
d8004510e5
Updated changelog (fixed two bugs) 2021-01-13 19:48:30 +01:00
TheBusyBiscuit
5ed452660f Fixed elevator order (highest floor first) 2021-01-11 13:07:46 +01:00
TheBusyBiscuit
7a4712f930 Removed obsolete things 2021-01-11 12:33:49 +01:00
TheBusyBiscuit
32474a588b Added ElevatorFloor class from PR #2699 2021-01-11 10:56:46 +01:00
TheBusyBiscuit
577ad2c308 [CI skip] Prepare RC-19 2021-01-11 10:33:12 +01:00
TheBusyBiscuit
7e48d96fa3 Removed "written book" slimefun guide and disabled elevators 2021-01-11 02:39:54 +01:00
TheBusyBiscuit
4c879ac3b3 Added AndroidFarmEvent (+ refactored Farmer Androids) 2021-01-10 21:20:43 +01:00
TheBusyBiscuit
22b5421118 Fixed /sf timings --verbose not working correctly (+refactoring) 2021-01-10 13:38:07 +01:00
TheBusyBiscuit
75b72eb630 Removed deprecated stuff 2021-01-06 16:26:40 +01:00
TheBusyBiscuit
f602b0436b
[CI skip] Updated changelog 2021-01-03 19:50:39 +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
TheBusyBiscuit
43af06f888
[CI skip] Updated changelog 2020-12-24 02:27:41 +01:00
TheBusyBiscuit
0d5527793c
[CI skip] Updated changelog 2020-12-20 23:56:00 +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
3d54080001 [CI skip] A bit o refactoring 2020-12-12 14:00:11 +01:00
Senne Van Rompaey
3acd6926ad
Merge branch 'master' into refactoring/third-party-integrations 2020-12-10 22:02:21 +01:00
TheBusyBiscuit
8b45a8a009
[CI skip] Updated changelog 2020-12-10 21:50:36 +01:00
TheBusyBiscuit
f0f545dd9f
Fixed changelog 2020-12-10 00:23:00 +01:00
TheBusyBiscuit
36be4c29de More refactoring 2020-12-09 13:33:34 +01:00
TheBusyBiscuit
282367d6ff [CI skip] Removed an old version of bStats 2020-12-03 15:51:17 +01:00
TheBusyBiscuit
761126c673
[CI skip] Updated changelog 2020-12-03 15:40:24 +01:00
TheBusyBiscuit
e717b77ddc [CI skip] Might as well push this today 2020-12-03 15:28:58 +01:00
TheBusyBiscuit
42d393296a
[CI skip] Added a release date for RC-18 2020-12-03 12:28:27 +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
d0e7e21877 Performance and memory improvements 2020-11-25 14:27:46 +01:00
TheBusyBiscuit
354dd30e52 Removed EmeraldEnchants integration 2020-11-23 16:58:08 +01:00
TheBusyBiscuit
f689c2fc4f Added an item setting to the Infused Hopper to toggle it with redstone 2020-11-21 15:34:09 +01:00
TheBusyBiscuit
3bd595a930 Fixes #2421 2020-11-21 14:18:54 +01:00
TheBusyBiscuit
55188bfd0a Fixes #2518 (+ refactoring and documentation) 2020-11-21 14:06:38 +01:00
TheBusyBiscuit
5bf3e38bae Fixed Armor Stands getting damaged/pushed by Explosive Bow 2020-11-20 13:39:25 +01:00
TheBusyBiscuit
15f281504f More performance and memory improvements 2020-11-19 22:20:43 +01:00