mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 20:25:54 +00:00
Code Releases Activity
4,631 Commits 1 Branch 0 Tags 64 MiB
e7097e2c2b
Commit Graph

665 Commits

Author SHA1 Message Date
Daniel Walsh
5e3eccfaa4 Fix some regex, finals and replace isPresent with ifPresent 2020-07-22 18:06:42 +01:00
TheBusyBiscuit
4e0df92b56 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
into experimental

Conflicts:
	CHANGELOG.md
	src/main/java/io/github/thebusybiscuit/slimefun4/api/ErrorReport.java
	src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java
 2020-07-20 12:46:12 +02:00
TheBusyBiscuit
3455c70d58 More refactoring 2020-07-15 19:19:38 +02:00
TheBusyBiscuit
eaaf0c5c01 Another performance improvement to Energy networks 2020-07-15 18:23:21 +02:00
TheBusyBiscuit
c574337318 Reworked Energy Providers (Generators) 2020-07-15 13:17:27 +02:00
TheBusyBiscuit
0735eaad83 [CI skip] Removed more deprecated code 2020-07-14 13:19:04 +02:00
TheBusyBiscuit
5c159b4247 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
into experimental

Conflicts:
	CHANGELOG.md
	src/main/java/io/github/thebusybiscuit/slimefun4/api/ErrorReport.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunPlugin.java
 2020-07-13 10:41:53 +02:00
TheBusyBiscuit
0f7318a749 [CI skip] Removed deprecated classes 2020-07-13 10:36:16 +02:00
TheBusyBiscuit
8fd0afd8bd Fixes #2081 2020-07-09 18:35:48 +02:00
TheBusyBiscuit
6d3e4ca96b Added a missing annotation 2020-07-09 13:59:16 +02:00
TheBusyBiscuit
c9c760836e Another class relocation 2020-07-09 12:43:26 +02:00
TheBusyBiscuit
c516cab263 Some refactoring and small optimizations 2020-07-08 11:26:44 +02:00
TheBusyBiscuit
0984afb3c6 Post-PR refactoring 2020-07-07 10:54:32 +02:00
TheBusyBiscuit
f304406aa8
[CI skip] Merge pull request #2071 from dniym/ChanceDrop 
Added Chance Drop for MOB_DROP recipe items. References #980
 2020-07-07 10:28:51 +02:00
dniym
371b283d21 Replaced Tabs with Spaces as requested 2020-07-06 19:19:13 -04:00
TheBusyBiscuit
afd63a1f51 Small performance optimization for large Cargo networks 2020-07-06 22:04:32 +02:00
dniym
43b48b4b3d Made Requested Changes 2020-07-05 16:54:27 -04:00
dniym
96b4394d7f Made requested changes 2020-07-05 16:45:08 -04:00
dniym
645d73d0ef Made requested changes. 2020-07-05 10:40:07 -04:00
TheBusyBiscuit
b01254eb9d Added Reinforced Cloth 2020-07-05 13:01:17 +02:00
TheBusyBiscuit
9426ebb2e9 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
into experimental

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunPlugin.java
 2020-07-05 12:08:30 +02:00
TheBusyBiscuit
88dfdfa560 Small improvement to Cargo performance 2020-07-05 12:04:40 +02:00
TheBusyBiscuit
4edc557547 Fixed an issue where moving Androids got stuck 2020-07-05 11:46:20 +02:00
TheBusyBiscuit
5a19b18633 Thunderstorms now count as night for Solar Generators (+ other stuff) 2020-07-04 19:04:29 +02:00
dniym
f80bada54b Made Requested Changes 2020-07-04 09:36:29 -04:00
dniym
1ddd763dbf Added Chance Drop for MOB_DROP recipe items. References #980 
Added interface for ChanceDrop items

Added a check for chance drop items in the EntityDeathListener

Adjusted circuit board to have a 75% chance rather than 100% chance
 2020-07-03 23:19:19 -04:00
TheBusyBiscuit
4ddea8f7ae Small performance improvement 2020-07-02 20:41:40 +02:00
TheBusyBiscuit
a4197fe5dd A couple of performance and memory optimizations 2020-06-30 21:31:55 +02:00
TheBusyBiscuit
cb7cc4402f Refactoring 2020-06-30 01:33:13 +02:00
TheBusyBiscuit
6f1a2b82b5 Added runtime deprecation warnings for Addon Creators 2020-06-29 17:12:54 +02:00
TheBusyBiscuit
3415a124c7 A bunch of refactoring 2020-06-29 15:47:51 +02:00
TheBusyBiscuit
acd8278889
Merge pull request #2045 from LinoxGH/ExplosiveBowChange 
Explosive Bow Area of Effect
 2020-06-29 11:46:44 +02:00
LinoxGH
ba0c3b30dd Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into HazmatSuitBees 
 Conflicts:
	src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java
 2020-06-27 16:01:36 +03:00
TheBusyBiscuit
3dc043c857 Refactoring: Relocated Plugin class 2020-06-27 13:10:47 +02:00
LinoxGH
73973a00b7 Did the requested changes and some fixes. 2020-06-27 12:26:15 +03:00
LinoxGH
52dc7585fc Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into HazmatSuitBees 
 Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/ArmorTask.java
 2020-06-27 08:09:09 +03:00
LinoxGH
ffd57ec760 Did the requested Changes 2020-06-27 01:51:38 +03:00
LinoxGH
29fe881768 Added a new lore to Hazmat Suit for 1.15+ 2020-06-26 23:31:15 +03:00
LinoxGH
cd4a36c519 Added Bee Protection to Hazmat Suit. 2020-06-26 23:18:27 +03:00
TheBusyBiscuit
28e5b57c5d Some better exception handling 2020-06-26 17:36:57 +02:00
TheBusyBiscuit
8d0c816ed2 Some performance improvements 2020-06-26 16:27:16 +02:00
TheBusyBiscuit
6ffa5ab9a7 Lots of refactoring and rewriting of Item Energy 2020-06-26 15:32:57 +02:00
LinoxGH
1a8ff9c511 Merge branch 'master' of https://github.com/LinoxGH/Slimefun4 into ExplosiveBowChange 2020-06-25 22:16:49 +03:00
LinoxGH
e016ea1180 Explosive Bow Functionality Changed. 
Explosive Bow now deals an area of effect.
 2020-06-25 22:13:24 +03:00
TheBusyBiscuit
427a312240 More steps towards 1.16 compatibility (unfinished) 2020-06-25 14:43:17 +02:00
TheBusyBiscuit
92e7e58915
Merge branch 'master' into support/1.16 2020-06-25 13:40:28 +02:00
SoSeDiK
e52ac9d43b Make it compile 2020-06-25 13:06:34 +03:00
SoSeDiK
386cbea53b Whoops 2020-06-25 12:59:02 +03:00
SoSeDiK
ade18c7bd8 Remove unused import 2020-06-25 12:58:04 +03:00
SoSeDiK
4ed2258eb0 Replace stream with for loop 2020-06-25 12:49:18 +03:00
Daniel Walsh
81e16a6c47 1.16 support 2020-06-25 06:05:17 +01:00
SoSeDiK
ecd97b3e50 Fixed a tiny typo 2020-06-25 05:54:21 +03:00
SoSeDiK
c175596536 Improve the handling of non-registered worlds 2020-06-25 05:33:02 +03:00
TheBusyBiscuit
cccc8f2162
[CI skip] Merge pull request #2015 from LinoxGH/master 
Added Magic Pills. The Edited Version
 2020-06-24 21:11:30 +02:00
TheBusyBiscuit
8d373a3812 Minor changes 2020-06-24 14:54:43 +02:00
LinoxGH
3278457441 Did the requested changes. 2020-06-24 01:06:48 +03:00
LinoxGH
9205b143ed Added Magic Pills. 
Added Magic Pills which are used to cure zombie villagers.
Approved suggestion #178
 2020-06-23 21:11:08 +03:00
TheBusyBiscuit
4504259546 Fixed a Unit test 2020-06-22 23:02:21 +02:00
TheBusyBiscuit
bab94652bc Duplication glitch fix and performance improvements for Rainbow blocks 2020-06-22 22:45:14 +02:00
TheBusyBiscuit
a06e49cf13 Improvements to error logging in world loading 2020-06-22 01:55:11 +02:00
TheBusyBiscuit
8e07ada321 Reduced technical debt / Refactoring 2020-06-21 10:26:54 +02:00
TheBusyBiscuit
68532ea38f Small improvement 2020-06-20 21:41:19 +02:00
TheBusyBiscuit
24cea8dade Further Improvements on the backwards-compatibility toggle 2020-06-20 21:39:41 +02:00
TheBusyBiscuit
c98aca37f1 Massive Performance improvements to GEO-Miner and Oil Pump 2020-06-20 19:33:37 +02:00
TheBusyBiscuit
4b38dd655d Added ReactorExplodeEvent to the API 2020-06-20 19:21:44 +02:00
TheBusyBiscuit
1456245ee0 Added a toggle for backwards compatibility 2020-06-20 11:56:29 +02:00
TheBusyBiscuit
7059ad216c Refactoring and general improvements 2020-06-19 13:22:52 +02:00
TheBusyBiscuit
5c14bc5cbe Refactoring 2020-06-17 01:24:47 +02:00
TheBusyBiscuit
e82acc0b3c Refactoring 2020-06-16 15:36:44 +02:00
TheBusyBiscuit
0fd631813b [CI skip] Removed some deprecated stuff 2020-06-16 14:50:03 +02:00
TheBusyBiscuit
314907eb82 A ton of refactoring 2020-06-16 14:16:21 +02:00
TheBusyBiscuit
c77a2c2997 Did some long overdue refactoring 2020-06-16 01:54:18 +02:00
TheBusyBiscuit
d628f8586f Really really big refactoring and deprecation 2020-06-16 01:16:14 +02:00
TheBusyBiscuit
da7291995b [CI skip] Added some Unit Tests for commands 2020-06-10 17:11:28 +02:00
TheBusyBiscuit
005d2a3c6a Fixed lore 2020-06-09 23:36:01 +02:00
TheBusyBiscuit
013696a759
Merge branch 'master' into feature/miner 2020-06-09 00:12:33 +02:00
TheBusyBiscuit
bd712472d5 Balancing changes to Organic Food/Fertilizer, added cocoa variant 2020-06-08 23:13:44 +02:00
TheBusyBiscuit
fcd17d3a5a Updated lore for advanced industrial miner 2020-06-05 14:37:31 +02:00
TheBusyBiscuit
8bde659daf The Advanced Miner now preserves buckets 2020-06-05 14:34:24 +02:00
TheBusyBiscuit
15aabd6a63 Attributes are now hidden 2020-06-05 00:37:21 +02:00
TheBusyBiscuit
aebd03301d Added new ItemStacks 2020-06-04 23:56:08 +02:00
TheBusyBiscuit
618bbfff24 Optimized Fuel 2020-06-04 23:55:53 +02:00
TheBusyBiscuit
968b3df10a Relocated Multiblock class 2020-06-03 09:51:51 +02:00
TheBusyBiscuit
31a9b69651 Refactored Backpacks 2020-06-02 13:58:03 +02:00
TheBusyBiscuit
595767ad03 Some cleanup 2020-06-02 13:50:29 +02:00
TheBusyBiscuit
0faaef9b25 Removed Digital Miners 2020-06-01 14:10:22 +02:00
TheBusyBiscuit
f65ac6b68c Lava can no longer be used as a coolant for reactors 2020-06-01 14:02:49 +02:00
TheBusyBiscuit
2f09470b51 [Ci skip] Reduced technical debt 2020-06-01 13:52:04 +02:00
TheBusyBiscuit
5378341839 [Ci skip] Refactoring and proper deprecation of the HandledBlock class 2020-05-30 14:53:29 +02:00
TheBusyBiscuit
929f26d103 [CI skip] Reduced technical debt 2020-05-30 13:21:17 +02:00
TheBusyBiscuit
efd9903ace [CI skip] Refactoring 2020-05-29 12:07:24 +02:00
TheBusyBiscuit
6ca1f7dca9 [Ci skip] Removed deprecated stuff 2020-05-29 01:39:21 +02:00
TheBusyBiscuit
e2b979fca9 Pushing a new "stable" build 2020-05-27 13:43:52 +02:00
TheBusyBiscuit
982a07262e Another relocation 2020-05-26 10:21:58 +02:00
TheBusyBiscuit
f38c895780 [CI skip] Updated MockBukkit and re-enabled Deathpoint tests 2020-05-24 19:12:45 +02:00
TheBusyBiscuit
6a4e23853c Added more Unit Tests 2020-05-24 01:48:42 +02:00
TheBusyBiscuit
efcc9c1a4b [CI skip] Refactoring 2020-05-24 00:49:27 +02:00
TheBusyBiscuit
a6a4a0a671 [CI skip] Infrastructure for further Unit Testing 2020-05-22 18:01:25 +02:00
TheBusyBiscuit
902367de0c Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-05-22 16:40:33 +02:00
TheBusyBiscuit
de93daf9be [CI skip] Updated MockBukkit 2020-05-22 16:40:26 +02:00