mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Code Releases Activity
4,262 Commits 1 Branch 0 Tags 64 MiB
11d751eecd
Commit Graph

337 Commits

Author SHA1 Message Date
TheBusyBiscuit
0412a2aec1 Fixes #2151 2020-07-30 10:23:44 +02:00
TheBusyBiscuit
ac4cfd3d68 Fixes #2145 2020-07-29 21:57:08 +02:00
TheBusyBiscuit
eb8e689d2c Fixes #2143 2020-07-29 13:03:52 +02:00
TheBusyBiscuit
f52866cf1f [CI skip] Updated change log 2020-07-29 12:38:16 +02:00
TheBusyBiscuit
c3ab3a6ecc Fixed Enttiy Assemblers 2020-07-25 14:45:57 +02:00
TheBusyBiscuit
92ca696140 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
into experimental

Conflicts:
	CHANGELOG.md
 2020-07-25 14:27:12 +02:00
TheBusyBiscuit
da37e78ffc
[CI skip] Updated change log 2020-07-25 13:55:52 +02:00
TheBusyBiscuit
33f7c42e2c Added an option to disable the "Ignoring duplicate block" message 2020-07-25 12:28:04 +02:00
TheBusyBiscuit
499bbdbf70
Merge branch 'master' into experimental 2020-07-24 16:36:08 +02:00
TheBusyBiscuit
cd944e35b8
[CI skip] Updated CHANGELOG 2020-07-24 16:15:43 +02:00
TheBusyBiscuit
d69ef1effb
Merge pull request #2107 from WalshyDev/feature/metrics-module 
Metrics!
 2020-07-24 16:06:53 +02:00
TheBusyBiscuit
1f7b75b823 Added Iron Golem Assembler (experimental) 2020-07-23 12:02:53 +02:00
TheBusyBiscuit
ee62a9b004 Optimized Enhanced Furnaces for Paper and fixes #1894 2020-07-23 01:23:03 +02:00
TheBusyBiscuit
916fb554d0 Fixes #2086 2020-07-23 00:52:59 +02:00
TheBusyBiscuit
31e4cfa29b
Merge branch 'master' into feature/metrics-module 2020-07-22 20:43:39 +02:00
TheBusyBiscuit
86c253c929 [CI skip] Updated change log 2020-07-22 15:32:26 +02:00
Daniel Walsh
f632dee560 Modify changelog 2020-07-21 13:59:48 +01:00
TheBusyBiscuit
f1e650b28c
Merge branch 'master' into experimental 2020-07-21 10:18:34 +02:00
TheBusyBiscuit
2d64f37999
Update CHANGELOG.md 2020-07-20 19:33:03 +02: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
613bcd86b8 Fixes #2093 2020-07-20 12:43:05 +02:00
TheBusyBiscuit
14e062810b Fixes #2075 2020-07-19 10:53:09 +02:00
TheBusyBiscuit
c78e3c3959 Performance improvements for cargo (when ChestTerminals is installed) 2020-07-16 22:41:36 +02:00
TheBusyBiscuit
c574337318 Reworked Energy Providers (Generators) 2020-07-15 13:17:27 +02:00
TheBusyBiscuit
61a56c1ee4
Fixed change log (again) 2020-07-13 17:01:24 +02:00
TheBusyBiscuit
cf89ee1f6f
Fixed change log 2020-07-13 17:00:21 +02:00
TheBusyBiscuit
50c579b7d6 Added a Tape Measure to the experimental branch 2020-07-13 11:55:59 +02:00
TheBusyBiscuit
d4a1501523 Merge branch 'experimental' of 
https://github.com/TheBusyBiscuit/Slimefun4 into experimental

Conflicts:
	CHANGELOG.md
 2020-07-13 10:42:15 +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
9af908300f Fixed a NullPointerException for Error-Reports for generators 2020-07-12 13:19:16 +02:00
TheBusyBiscuit
058f34879a Moved the Soulbound Backpack to "Magical Gadgets" 2020-07-10 18:02:51 +02:00
TheBusyBiscuit
f93117ffa3
[CI skip] Set release date for RC-14 2020-07-10 16:49:09 +02:00
TheBusyBiscuit
8fd0afd8bd Fixes #2081 2020-07-09 18:35:48 +02:00
TheBusyBiscuit
d677c29298
Merge branch 'master' into experimental 2020-07-08 13:34:27 +02:00
TheBusyBiscuit
afd63a1f51 Small performance optimization for large Cargo networks 2020-07-06 22:04:32 +02:00
TheBusyBiscuit
613dc7b328
Merge branch 'master' into experimental 2020-07-05 16:54:06 +02:00
TheBusyBiscuit
b243f128de Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-07-05 15:07:32 +02:00
TheBusyBiscuit
098304a1c4 Implemented a texture cache for contributors 2020-07-05 15:07:28 +02:00
TheBusyBiscuit
3408fcf11f Updated assets 2020-07-05 14:39:28 +02:00
TheBusyBiscuit
1dc20e5197
Update CHANGELOG.md 2020-07-05 13:35:39 +02:00
TheBusyBiscuit
e3a920826d One more change 2020-07-05 13:30:13 +02:00
TheBusyBiscuit
b01254eb9d Added Reinforced Cloth 2020-07-05 13:01:17 +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
TheBusyBiscuit
768e4f1021 Massive performance improvements to Rainbow Glass Panes 2020-07-03 17:43:10 +02:00
TheBusyBiscuit
4ddea8f7ae Small performance improvement 2020-07-02 20:41:40 +02:00
TheBusyBiscuit
8cbaf14d2e Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
into feature/profiler

Conflicts:
	CHANGELOG.md
 2020-07-02 11:51:38 +02:00
TheBusyBiscuit
548e3586ae Fixes #2066 2020-07-02 11:50:07 +02:00
TheBusyBiscuit
1016b5fc76 Added better summaries, ratings + more performance improvements 2020-07-01 18:20:34 +02:00
TheBusyBiscuit
d82b66a842 Added a better profiler 2020-06-30 19:36:55 +02:00
TheBusyBiscuit
527ffdd742 Added Gilded Blackstone recipe to the Ore Crusher 2020-06-30 02:12:40 +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
4f2bb90f15 [CI skip] Slight refactoring 2020-06-29 12:10:45 +02:00
TheBusyBiscuit
c5da9a3b4f [CI skip] Updated change log 2020-06-29 03:26:30 +02:00
TheBusyBiscuit
03c08ed6f1 Fixes #2062 2020-06-28 11:20:56 +02:00
TheBusyBiscuit
4314581a61 Another fix and an addition 2020-06-27 14:22:45 +02:00
TheBusyBiscuit
50aaa4b965 Added a few more items to the Bio Generator 2020-06-27 14:04:31 +02:00
TheBusyBiscuit
44c0029587 Fixed a rare concurrency issue with world saving 2020-06-27 02:47:53 +02:00
TheBusyBiscuit
6ffa5ab9a7 Lots of refactoring and rewriting of Item Energy 2020-06-26 15:32:57 +02:00
TheBusyBiscuit
d18af0c211 Ore Crusher now also accepts Nether Gold Ore 2020-06-25 15:27:18 +02:00
TheBusyBiscuit
427a312240 More steps towards 1.16 compatibility (unfinished) 2020-06-25 14:43:17 +02:00
TheBusyBiscuit
c64b311ee2 Finished merge of PR #2015 and updated language keys 2020-06-24 21:25:21 +02:00
TheBusyBiscuit
6840a1e957 Updated assets 2020-06-24 18:57:12 +02:00
TheBusyBiscuit
d3f1dc6fb3 Fixes #1855 plus a few optimizations 2020-06-24 18:50:39 +02:00
TheBusyBiscuit
8d373a3812 Minor changes 2020-06-24 14:54:43 +02:00
TheBusyBiscuit
1c50d29fa8 Added Nether Quartz Ore Crusher Recipe 2020-06-22 22:49:07 +02:00
TheBusyBiscuit
bab94652bc Duplication glitch fix and performance improvements for Rainbow blocks 2020-06-22 22:45:14 +02:00
TheBusyBiscuit
bdb25b74ec Changed the texture of the Nether Star Reactor 2020-06-22 14:22:41 +02:00
TheBusyBiscuit
7d8ef33d78 Changed the texture for the Nuclear Reactor 2020-06-22 12:07:56 +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
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
907fb1566a Fixes #2009 2020-06-20 18:52:30 +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
3c3dd48e9b Fixes #2005 2020-06-18 21:15:47 +02:00
TheBusyBiscuit
5c14bc5cbe Refactoring 2020-06-17 01:24:47 +02:00
TheBusyBiscuit
0fd631813b [CI skip] Removed some deprecated stuff 2020-06-16 14:50:03 +02:00
TheBusyBiscuit
6c017b87cf A new update 2020-06-16 14:21:00 +02:00
TheBusyBiscuit
314907eb82 A ton of refactoring 2020-06-16 14:16:21 +02:00
TheBusyBiscuit
ffa3ea1c1b Further improvements to Unit Tests 2020-06-15 15:01:33 +02:00
TheBusyBiscuit
4efc10db15 Fixes #1907 2020-06-15 11:53:38 +02:00
TheBusyBiscuit
c84dd02b39 Fixes #1993 2020-06-14 19:28:51 +02:00
TheBusyBiscuit
4855f0da86 Androids now have a seperate category 2020-06-14 18:58:38 +02:00
TheBusyBiscuit
2bead0cd3d Maybe fixes #1951 2020-06-14 13:34:31 +02:00
TheBusyBiscuit
2733b8a17b Fixes #1992 and changes to the fishing loot for androids 2020-06-14 13:01:38 +02:00
TheBusyBiscuit
85af23c17c Fixes #1988 2020-06-14 02:36:32 +02:00
TheBusyBiscuit
debc925bd0 Fixes #1976 2020-06-13 21:24:28 +02:00
TheBusyBiscuit
c5cc2a86ff [CI skip] Refactoring and optimizations 2020-06-11 13:50:22 +02:00
TheBusyBiscuit
25d970ea94 Fixes #1971 2020-06-11 09:34:29 +02:00
TheBusyBiscuit
f58d6aeff4 Small performance improvement 2020-06-11 00:43:17 +02:00
TheBusyBiscuit
7acee959ce Lots of refactoring 2020-06-10 23:33:51 +02:00
TheBusyBiscuit
013696a759
Merge branch 'master' into feature/miner 2020-06-09 00:12:33 +02:00
TheBusyBiscuit
abe8afab67 More balancing for Organic Food/Fertilizer 2020-06-08 23:25:45 +02:00
TheBusyBiscuit
bd712472d5 Balancing changes to Organic Food/Fertilizer, added cocoa variant 2020-06-08 23:13:44 +02:00
TheBusyBiscuit
fb58b5cf33 Updated changelog 2020-06-05 14:14:13 +02:00