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

3258 Commits

Author SHA1 Message Date
HeroBrineKing
191c4ffa60 Translate researches_zh-TW.yml via GitLocalize 2020-07-25 13:33:44 +00:00
TheBusyBiscuit
9435dfa2f2 Reduced technical debt and fixed a small issue 2020-07-25 15:29:45 +02:00
Scott Gomez Andoy
8792d8eace Translate researches_tl.yml via GitLocalize 2020-07-25 13:19:02 +00:00
Scott Gomez Andoy
9d1b307568 Translate messages_tl.yml via GitLocalize 2020-07-25 13:19:00 +00:00
MeerBiene
85d7cb0f69 Translate researches_de.yml via GitLocalize 2020-07-25 13:15:18 +00:00
TheBusyBiscuit
5b706ca6b3 Translate messages_de.yml via GitLocalize 2020-07-25 13:15:17 +00:00
TheBusyBiscuit
17cd55bf53
Merge pull request #2072 from TheBusyBiscuit/experimental 
Merge of "experimental" branch
 2020-07-25 15:07:47 +02:00
TheBusyBiscuit
447012efdf Don't consume zombie pills in creative 2020-07-25 15:02:51 +02:00
TheBusyBiscuit
dc854326ff Added sound effects to the Iron Golem Assembler 2020-07-25 14:59:53 +02:00
TheBusyBiscuit
e92e95c59e Fixed Enchantment Rune 2020-07-25 14:57:05 +02:00
TheBusyBiscuit
c3ab3a6ecc Fixed Enttiy Assemblers 2020-07-25 14:45:57 +02:00
TheBusyBiscuit
f15efd6cc2 Iron Golems require Carved Pumpkins 2020-07-25 14:42:29 +02:00
Scott Gomez Andoy
30e1a6ce0a Translate messages_tl.yml via GitLocalize 2020-07-25 12:41:27 +00:00
TheBusyBiscuit
107957a805 Fixed lore 2020-07-25 14:41:15 +02:00
TheBusyBiscuit
88604ee432 Fixed Iron Golem Assembler spawning Withers :o 2020-07-25 14:37:04 +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
20372f7e05
[CI skip] Merge pull request #2125 from TheBusyBiscuit/gitlocalize-12442 
Updated Ukrainian localizations
 2020-07-25 14:23:10 +02:00
TheBusyBiscuit
583a971c4f
[CI skip] Merge pull request #2124 from TheBusyBiscuit/gitlocalize-12441 
Updated Russian localizations
 2020-07-25 14:22:44 +02:00
TheBusyBiscuit
6374f09d29 Translate messages_de.yml via GitLocalize 2020-07-25 12:21:58 +00:00
TheBusyBiscuit
4b7e933410
[CI skip] Merge pull request #2123 from TheBusyBiscuit/gitlocalize-12440 
Updated Turkish Translation
 2020-07-25 14:19:52 +02:00
TheBusyBiscuit
42c57f8907 [CI skip] Small change 2020-07-25 14:19:09 +02:00
SoSeDiK
77f5224d14 Translate messages_uk.yml via GitLocalize 2020-07-25 12:05:24 +00:00
SoSeDiK
c6db53205c Translate messages_ru.yml via GitLocalize 2020-07-25 12:04:24 +00:00
LinoxGH
b68227b7b8 Translate messages_tr.yml via GitLocalize 2020-07-25 12:03:34 +00:00
TheBusyBiscuit
ebce279cf2
Merge pull request #2121 from poma123/patch-2 fixes #2097 
Fixed piglin SlimefunItem pickup
 2020-07-25 13:56:58 +02:00
poma123
dde3ec26ba Requested changes 2020-07-25 13:51:10 +02:00
poma123
a323b09e38 Fixed a tremendous mistake 2020-07-25 13:41:11 +02:00
poma123
5ff93b75e0 Added PiglinListener 2020-07-25 13:37:04 +02:00
poma123
a6d69ee9d6 Requested changes 2020-07-25 12:31:52 +02:00
TheBusyBiscuit
33f7c42e2c Added an option to disable the "Ignoring duplicate block" message 2020-07-25 12:28:04 +02:00
poma123
17a68ddcf5 Removed unnecessary Zombified Piglin check 2020-07-25 12:19:02 +02:00
poma123
9fb79c8622 Fixed piglin SlimefunItem pickup 2020-07-25 12:04:22 +02:00
TheBusyBiscuit
abc47af565 Fixed exception handling 2020-07-24 19:11:38 +02:00
LinoxGH
8481f0cde3
Merge branch 'experimental' into ShulkerShell 2020-07-24 19:42:12 +03:00
TheBusyBiscuit
499bbdbf70
Merge branch 'master' into experimental 2020-07-24 16:36:08 +02:00
András Marczinkó
6d74effbdf Translate resources_hu.yml via GitLocalize 2020-07-24 14:34:45 +00:00
András Marczinkó
3e5799391a Translate recipes_hu.yml via GitLocalize 2020-07-24 14:34:44 +00:00
András Marczinkó
b9fb1fe7bd Translate researches_hu.yml via GitLocalize 2020-07-24 14:34:42 +00:00
András Marczinkó
6cfc8b7bfc Translate categories_hu.yml via GitLocalize 2020-07-24 14:34:41 +00:00
TheBusyBiscuit
47be5f16ce [CI skip] Refactoring, also removed more deprecated things 2020-07-24 16:33:09 +02:00
TheBusyBiscuit
388300f25b
Merge pull request #2117 from kylehassall27/CrushCompressedCoal 
Add recipes to crush compressed carbon into carbon and carbon into coal
 2020-07-24 16:15:59 +02:00
TheBusyBiscuit
d69ef1effb
Merge pull request #2107 from WalshyDev/feature/metrics-module 
Metrics!
 2020-07-24 16:06:53 +02:00
KykyRocks1
dca5348aae Added recipes to crush compressed carbon into carbon and carbon into coal 2020-07-23 15:56:44 -04:00
TheBusyBiscuit
1f7b75b823 Added Iron Golem Assembler (experimental) 2020-07-23 12:02:53 +02:00
Daniel Walsh
b13776d729 Final changes 2020-07-23 10:37:23 +01:00
Daniel Walsh
6f92bd6c28 Requested changes 2020-07-23 09:51:35 +01: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
Daniel Walsh
d547d61151 Requested changes 2020-07-22 20:45:55 +01:00
TheBusyBiscuit
ba4282c3e7
[CI skip] Merge pull request #2109 from WalshyDev/change/some-small-changes 
Fix some regex, finals and replace isPresent with ifPresent
 2020-07-22 21:23:20 +02:00
TheBusyBiscuit
8c867c09b6 [CI skip] Some documentation 2020-07-22 21:17:25 +02:00
TheBusyBiscuit
31e4cfa29b
Merge branch 'master' into feature/metrics-module 2020-07-22 20:43:39 +02:00
Daniel Walsh
5e3eccfaa4 Fix some regex, finals and replace isPresent with ifPresent 2020-07-22 18:06:42 +01:00
TheBusyBiscuit
d2754f06fc [CI skip] A bit refactoring 2020-07-22 18:11:43 +02:00
Daniel Walsh
2646eba615 Small change 2020-07-21 14:51:04 +01:00
Daniel Walsh
52a3cbae41 Merge master 2020-07-21 13:57:40 +01:00
Poma123
5fa4e8b083
Added BONE_BLOCK to GrindStone 2020-07-21 13:51:08 +02:00
TheBusyBiscuit
f1e650b28c
Merge branch 'master' into experimental 2020-07-21 10:18:34 +02:00
TheBusyBiscuit
6eebb79314 Fixed 2020-07-21 09:56:29 +02:00
Daniel Walsh
58dbbd8944 Better handling of downloaded files, typo fix and small changes 2020-07-21 08:47:36 +01:00
Daniel Walsh
d31a293486 Requested changes 2020-07-20 16:04:49 +01:00
Daniel Walsh
d252e5a2b5 final final final small thing 2020-07-20 15:51:32 +01:00
Daniel Walsh
4d61a7db51 Reshade stupid bStats 2020-07-20 15:47:22 +01:00
Daniel Walsh
8da64ab308 Moved the metric class 2020-07-20 15:35:31 +01:00
Daniel Walsh
50f034b3e3 Documentation 2020-07-20 15:31:32 +01:00
TheBusyBiscuit
29b26ed327 Made requested changes 2020-07-20 16:30:20 +02:00
Daniel Walsh
fb40bffdce Small change 2020-07-20 15:17:24 +01:00
Daniel Walsh
55041e81b1 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into feature/metrics-module 2020-07-20 15:15:39 +01:00
Daniel Walsh
67db0ce59e Oh baby, this is a big one 2020-07-20 15:15:21 +01:00
TheBusyBiscuit
397f194029 Fixed two synchronization issues 2020-07-20 13:08:13 +02:00
TheBusyBiscuit
fd10f2ea4c Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into paper 2020-07-20 12:48:25 +02:00
TheBusyBiscuit
eb9466c41d Added a research for the Tape Measure (experimental) 2020-07-20 12:47:13 +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
f4c0c9f905 Minor changes 2020-07-20 10:49:59 +02:00
TheBusyBiscuit
64b59e3a02 Spigot is now called "Spigot" 2020-07-20 03:05:49 +02:00
TheBusyBiscuit
c1d6021216 Optimized teleportations 2020-07-20 02:31:58 +02:00
TheBusyBiscuit
045cdf1090 Added performance improvements for Block States 2020-07-20 02:22:24 +02:00
TheBusyBiscuit
ae780a69bb Added PaperLib 2020-07-20 01:51:14 +02:00
TheBusyBiscuit
14e062810b Fixes #2075 2020-07-19 10:53:09 +02:00
TheBusyBiscuit
8042deb591 Some small improvements 2020-07-19 10:31:12 +02:00
TheBusyBiscuit
c78e3c3959 Performance improvements for cargo (when ChestTerminals is installed) 2020-07-16 22:41:36 +02:00
Daniel Walsh
b59c53c2e6 Fix long outstanding prefix bug 2020-07-16 19:55:16 +01:00
TheBusyBiscuit
75ca7f1d4b Cargo performance improvement 2020-07-15 23:49:44 +02:00
TheBusyBiscuit
52efb03305 Relocated a class 2020-07-15 19:52:29 +02:00
TheBusyBiscuit
3455c70d58 More refactoring 2020-07-15 19:19:38 +02:00
TheBusyBiscuit
52dd7e9705 Refactoring 2020-07-15 18:50:26 +02:00
TheBusyBiscuit
d26eed4534 Removed redundant check 2020-07-15 18:46:17 +02:00
TheBusyBiscuit
72e1cc33bb Minor change 2020-07-15 18:23:57 +02:00
TheBusyBiscuit
eaaf0c5c01 Another performance improvement to Energy networks 2020-07-15 18:23:21 +02:00
TheBusyBiscuit
f14ec8dc99 Missed one line 2020-07-15 13:20:47 +02:00
TheBusyBiscuit
45c01df9dc Updated to latest Spigot API methods 2020-07-15 13:19:51 +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
572d3dceec
Merge branch 'experimental' into ShulkerShell 2020-07-13 17:05:39 +02:00
TheBusyBiscuit
50c579b7d6 Added a Tape Measure to the experimental branch 2020-07-13 11:55:59 +02:00
TheBusyBiscuit
f5db4bf695 Merge branch 'master' 2020-07-13 10:42:47 +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
koloksk
28b44f8dd8 Translate categories_pl.yml via GitLocalize 2020-07-13 08:32:18 +00:00
Wirusiu
8c1c72cafd Translate messages_pl.yml via GitLocalize 2020-07-13 08:32:17 +00:00
Wirusiu
5ccf0faedf Translate researches_pl.yml via GitLocalize 2020-07-13 08:32:12 +00:00
Nathan Adhitya
a342aaa1cc Translate categories_id.yml via GitLocalize 2020-07-13 08:16:08 +00:00
Scott Gomez Andoy
8dbb2cf2fb Translate researches_tl.yml via GitLocalize 2020-07-12 14:09:00 +00: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
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
4dcc73bbf8 Fixed javadocs 2020-07-09 13:58:04 +02:00
TheBusyBiscuit
c9c760836e Another class relocation 2020-07-09 12:43:26 +02:00
TheBusyBiscuit
c2b0121a07 More refactoring 2020-07-08 13:32:19 +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
367dd8c914 Negated isDroppedFromGolems 2020-07-06 22:28:41 -04:00
dniym
371b283d21 Replaced Tabs with Spaces as requested 2020-07-06 19:19:13 -04:00
TheBusyBiscuit
5e54cd9ec5 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-07-06 22:04:45 +02: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
bito-blosh
0c0e45a34b Translate recipes_ja.yml via GitLocalize 2020-07-05 16:46:45 +00:00
dniym
b3f801d84e Made requested changes 2020-07-05 12:35:40 -04:00
dniym
645d73d0ef Made requested changes. 2020-07-05 10:40:07 -04: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
EnderWingZ
ceb8af5e58 Translate messages_id.yml via GitLocalize 2020-07-05 12:36:19 +00:00
Frozenkamui
fe6f61cce2 Translate researches_id.yml via GitLocalize 2020-07-05 12:36:11 +00:00
TheBusyBiscuit
e3a920826d One more change 2020-07-05 13:30:13 +02:00
TheBusyBiscuit
6a950fe8d6 Fixed lore 2020-07-05 13:06:13 +02:00
TheBusyBiscuit
b01254eb9d Added Reinforced Cloth 2020-07-05 13:01:17 +02:00
TheBusyBiscuit
74cf035709 Fixed a NullPointerException 2020-07-05 12:13:03 +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
7d901744fd Small improvement 2020-07-04 19:15:13 +02:00
TheBusyBiscuit
5a19b18633 Thunderstorms now count as night for Solar Generators (+ other stuff) 2020-07-04 19:04:29 +02:00
dniym
27149ee514 Fixed formatting error 2020-07-04 09:42:17 -04:00
dniym
aca5b6efc5 Removed unused import 2020-07-04 09:39:13 -04: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
768e4f1021 Massive performance improvements to Rainbow Glass Panes 2020-07-03 17:43:10 +02:00
TheBusyBiscuit
06b14836dd Added plugins summary to /sf timings 2020-07-03 14:47:51 +02:00
LinoxGH
bbcf1da3e2 Translate recipes_tr.yml via GitLocalize 2020-07-02 20:47:59 +00:00
TheBusyBiscuit
4ddea8f7ae Small performance improvement 2020-07-02 20:41:40 +02:00
TheBusyBiscuit
b2f594ed88
Merge pull request #2064 from TheBusyBiscuit/feature/profiler 
Changes to performance, added a proper Lag Profiler
 2020-07-02 18:11:04 +02:00
TheBusyBiscuit
172a2c47fb Added a directional cache to Cargo Nodes, should improve performance 2020-07-02 18:04:26 +02:00
Scott Gomez Andoy
424cf12b64 Translate messages_tl.yml via GitLocalize 2020-07-02 11:27:02 +00:00
Scott Gomez Andoy
144483178d Translate categories_tl.yml via GitLocalize 2020-07-02 11:27:01 +00:00
TheBusyBiscuit
f233657fbd Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into feature/profiler 2020-07-02 12:51:55 +02:00
TheBusyBiscuit
b978a8def3 Another small fix 2020-07-02 11:57:11 +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
cfefa393a6 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-07-02 11:50:25 +02:00
TheBusyBiscuit
548e3586ae Fixes #2066 2020-07-02 11:50:07 +02:00
TheBusyBiscuit
697b173359 Refactoring 2020-07-02 11:26:38 +02:00
TheBusyBiscuit
ef7624dde9 Performance improvement for ChestTerminal 2020-07-01 20:39:01 +02:00
TheBusyBiscuit
1016b5fc76 Added better summaries, ratings + more performance improvements 2020-07-01 18:20:34 +02:00
LinoxGH
0e9c1a6ccf Removed a redundant import. 2020-07-01 10:33:25 +03:00
LinoxGH
7bf31d600e Did the requested change. 2020-07-01 10:31:06 +03:00
LinoxGH
9100dfe6f3 Minor refactoring and more documentation. 2020-06-30 23:38:21 +03:00
TheBusyBiscuit
a4197fe5dd A couple of performance and memory optimizations 2020-06-30 21:31:55 +02:00
TheBusyBiscuit
d82b66a842 Added a better profiler 2020-06-30 19:36:55 +02:00
TheBusyBiscuit
0aa99df8c2 Performance optimization 2020-06-30 16:44:50 +02:00
TheBusyBiscuit
527ffdd742 Added Gilded Blackstone recipe to the Ore Crusher 2020-06-30 02:12:40 +02:00
TheBusyBiscuit
cb7cc4402f Refactoring 2020-06-30 01:33:13 +02:00
TheBusyBiscuit
30c87b2256
Merge pull request #2046 from LinoxGH/EnchRune 
Enchantment Rune
 2020-06-30 01:23:20 +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
3713940512 Prevent Spigot from breaking everything... 2020-06-29 15:19:20 +02:00
LinoxGH
b6112e2728
Did a requested change. 2020-06-29 14:45:27 +03:00
TheBusyBiscuit
fe63637281 Removed unused folder 2020-06-29 13:04:36 +02:00
TheBusyBiscuit
4f2bb90f15 [CI skip] Slight refactoring 2020-06-29 12:10:45 +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
942bf436bb Did another requested change. 2020-06-29 10:02:54 +03:00
TheBusyBiscuit
7f7ed6861e Fixes #1959 and other Grappling hook-related issues 2020-06-29 03:04:31 +02:00
LinoxGH
833b2d3943 Did another requested change. 2020-06-29 01:11:01 +03:00
LinoxGH
28b5d545da Did some requested change. 2020-06-29 00:56:38 +03:00
LinoxGH
5c7accbbe8 Did the requested changes + a fix. 2020-06-28 23:46:09 +03:00
LinoxGH
27ba744fe5 Fixed a little bug. 2020-06-28 22:09:04 +03:00
LinoxGH
e55e2690e7 Did the requested changes. 2020-06-28 22:06:35 +03:00
TheBusyBiscuit
c63f4bf8af
Merge pull request #2057 from LinoxGH/HazmatSuitBees 
Added Bee Protection to Hazmat Suit.
 2020-06-28 17:12:10 +02:00
LinoxGH
911ee2340f Did a requested change. 2020-06-28 14:22:15 +03:00
TheBusyBiscuit
03c08ed6f1 Fixes #2062 2020-06-28 11:20:56 +02:00
LinoxGH
d7ba054bef Removed unused imports. 2020-06-28 05:39:32 +03:00
LinoxGH
f3d21daf6a Did the requested changes. 2020-06-28 05:38:49 +03:00
LinoxGH
3e271ac786 Did more requested changes. 2020-06-28 05:29:51 +03:00
LinoxGH
a935951c22 Oops forgot to change these. 2020-06-28 01:14:37 +03:00
LinoxGH
07d837299f Did the requested changes. 2020-06-28 01:07:37 +03:00
LinoxGH
558d069a33 Did the requested changes + improvements. 2020-06-27 17:45:39 +03:00
LinoxGH
64a1b247b4 Did the requested changes + fixes. 2020-06-27 17:30:28 +03:00
LinoxGH
a456034005 Fixed merge conflicts. 2020-06-27 16:07:22 +03: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
LinoxGH
b5ef8ff019 Did the requested changes + improvements. 2020-06-27 15:58:36 +03:00
TheBusyBiscuit
492010a8d4 Adjusted Unit Test to include new item tags 2020-06-27 14:32:13 +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
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
TheBusyBiscuit
ca36271a79
Merge pull request #2055 from TheBusyBiscuit/refactoring/item-energy 
Lots of refactoring and rewriting of Item Energy
 2020-06-27 03:43:55 +02:00
TheBusyBiscuit
6d36655081 Another optimization for Solar Generators 2020-06-27 03:40:27 +02:00
TheBusyBiscuit
bd2f4b196d Minor optimization for Solar Helmet checks 2020-06-27 03:29:10 +02:00
TheBusyBiscuit
468617d9a2 Changed a comment. 2020-06-27 03:13:43 +02:00
TheBusyBiscuit
44c0029587 Fixed a rare concurrency issue with world saving 2020-06-27 02:47:53 +02:00
TheBusyBiscuit
0dfd40e407 Fixed a few more color codes for 1.16 (Sorry Walshy :P ) 2020-06-27 02:35:29 +02:00
TheBusyBiscuit
f6f09d2e2e Some more refactoring 2020-06-27 02:28:01 +02:00
TheBusyBiscuit
b2833b3ce8 Removed unused parameter 2020-06-27 02:18:49 +02:00
TheBusyBiscuit
e081d15c6d Fixed a slight mistake with the lore 2020-06-27 01:46:20 +02:00
LinoxGH
ffd57ec760 Did the requested Changes 2020-06-27 01:51:38 +03:00
Vravinite
c941b9080f Translate recipes_es.yml via GitLocalize 2020-06-26 21:53:21 +00:00
HeroBrineKing
758e687783 Translate messages_zh-TW.yml via GitLocalize 2020-06-26 21:51:20 +00:00
HeroBrineKing
3ba284746b Translate researches_zh-TW.yml via GitLocalize 2020-06-26 21:51:18 +00:00
HeroBrineKing
6b89cd3fc2 Translate recipes_zh-TW.yml via GitLocalize 2020-06-26 21:51:17 +00:00
HeroBrineKing
dab48cbe13 Translate categories_zh-TW.yml via GitLocalize 2020-06-26 21:51:16 +00: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
80fc0a173e Added lore addition 2020-06-26 20:58:23 +02:00
TheBusyBiscuit
f99c727583 Added another Unit Test 2020-06-26 20:37:53 +02:00
TheBusyBiscuit
ed85a9a051 Added Unit tests for rechargeable items 2020-06-26 17:58:54 +02: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
eb2bbae0c9 Did the requested changes. 2020-06-26 13:31:45 +03:00
LinoxGH
9176d795c8 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into EnchRune 2020-06-26 13:28:45 +03:00
SoSeDiK
6ab2b34a83 Translate researches_uk.yml via GitLocalize 2020-06-26 08:53:56 +00:00
SoSeDiK
ca73b4a891 Translate recipes_uk.yml via GitLocalize 2020-06-26 08:53:54 +00:00
SoSeDiK
1e6ac71bef Translate messages_uk.yml via GitLocalize 2020-06-26 08:53:53 +00:00
TheBusyBiscuit
05740b4459
[CI skip] Merge pull request #2051 from TheBusyBiscuit/gitlocalize-12226 
Updated Russian messages
 2020-06-26 10:43:43 +02:00
TheBusyBiscuit
2b1acfd121
[CI skip] Merge pull request #2052 from TheBusyBiscuit/gitlocalize-12227 
Updated Russian researches
 2020-06-26 10:41:29 +02:00
SoSeDiK
5d283c053d Translate recipes_ru.yml via GitLocalize 2020-06-26 08:38:51 +00:00
SoSeDiK
1b159091a0 Translate researches_ru.yml via GitLocalize 2020-06-26 08:38:41 +00:00
SoSeDiK
e358289c4b Translate messages_ru.yml via GitLocalize 2020-06-26 08:38:32 +00:00
TheBusyBiscuit
df8ae5738d
[CI skip] Merge pull request #2050 from TheBusyBiscuit/gitlocalize-12224 
Update recipes_zh-CN.yml
 2020-06-26 10:34:58 +02:00
Nameless
682dcf1189 Translate recipes_zh-CN.yml via GitLocalize 2020-06-26 04:57:58 +00:00
Scott Gomez Andoy
526c2e5228 Translate recipes_tl.yml via GitLocalize 2020-06-25 23:36:17 +00:00
TheBusyBiscuit
1520e71107
Updated translators 2020-06-25 22:51:56 +02:00
krazybeat
2cc97398d0 Translate researches_pt-BR.yml via GitLocalize 2020-06-25 20:50:17 +00:00
FaolanMalcadh
514e6af7a6 Translate categories_pt-BR.yml via GitLocalize 2020-06-25 20:50:16 +00:00
LinoxGH
f54b277111 Merge branch 'master' of https://github.com/LinoxGH/Slimefun4 into EnchRune 
 Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/ResearchSetup.java
	src/main/resources/languages/researches_en.yml
 2020-06-25 22:35:14 +03: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
d18af0c211 Ore Crusher now also accepts Nether Gold Ore 2020-06-25 15:27:18 +02:00
TheBusyBiscuit
e66aa0baa5 Added Smithing Table Recipe support 2020-06-25 15:18:31 +02: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
TheBusyBiscuit
3b7ad0ac63
[CI skip] Merge pull request #2039 from LinoxGH/AutoDrierFix 
Auto Drier 1.13 Update
 2020-06-25 13:27:50 +02:00
LinoxGH
f9c8cd1d76 Fixed the recipe. 2020-06-25 14:08:57 +03:00
LinoxGH
82b9de4c54 Fixed merge conflict. 2020-06-25 13:38:30 +03:00
LinoxGH
7e20e7cd9f Merge branch 'master' of https://github.com/LinoxGH/Slimefun4 into AutoDrierFix 
 Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java
 2020-06-25 13:37:33 +03:00
TheBusyBiscuit
ff205aee4e
Merge pull request #2027 from SoSeDiK/storage 
Improve the handling of non-registered worlds
 2020-06-25 12:12:08 +02:00