mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 19:55:48 +00:00
Code Releases Activity
5,313 Commits 1 Branch 0 Tags 64 MiB
f4633c528f
Commit Graph

3973 Commits

Author SHA1 Message Date
Seggan
cbafa4c59c Moved some code and changed energized capacitor recipe 2020-09-20 20:15:32 -04:00
Seggan
5857b85199 Added research text 2020-09-20 12:52:16 -04:00
Seggan
55a384ab87 Made energized capacitor tier 3 (Did I miss any code?) 2020-09-20 12:16:56 -04:00
Seggan
641def8481 Added Energized Capacitor (From Discord suggestion) 2020-09-19 21:43:52 -04:00
poma123
8592051f87 Requested changes 2020-09-19 18:58:38 +02:00
TheBusyBiscuit
749bb972a3 [CI skip] Added a few more annotations 2020-09-19 11:51:02 +02:00
TheBusyBiscuit
23bf314905 Added fluid-sensitive tag 2020-09-19 11:39:35 +02:00
TheBusyBiscuit
9547d51db2 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
tags

Conflicts:
	CHANGELOG.md
	src/test/java/io/github/thebusybiscuit/slimefun4/testing/TestUtilities.java
 2020-09-19 11:35:41 +02:00
poma123
24a97c59d8 Refactoring 2020-09-19 10:37:33 +02:00
poma123
b98cdcf7d8 Added AsyncReactorProcessCompleteEvent 2020-09-19 10:37:06 +02:00
poma123
fa1aad7bf8 Added AsyncGeneratorProcessCompleteEvent 2020-09-19 10:36:27 +02:00
TheBusyBiscuit
917bcce636 Fixed an issue with ChestTerminal 2020-09-18 10:48:36 +02:00
Daniel Walsh
07f5687b9f
Merge pull request #2323 from LinoxGH/patch-3 2020-09-13 22:33:13 +01:00
LinoxGH
efe65bcd20
Fixed unit tests. 2020-09-14 00:11:34 +03:00
LinoxGH
19b95331d6
Added fire tag. 2020-09-13 23:55:16 +03:00
Panda.com
5b217246b6 fixed issue 2020-09-13 17:48:48 +02:00
TheBusyBiscuit
1e408665a7 [Ci skip] Removed deprecated method 2020-09-13 12:32:30 +02:00
TheBusyBiscuit
a98ff148e6 Jigsaw! 2020-09-13 12:06:43 +02:00
TheBusyBiscuit
b14f0b76c0 Added unbreakable tag 2020-09-13 12:00:45 +02:00
TheBusyBiscuit
a770378025 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags 2020-09-13 11:57:11 +02:00
TheBusyBiscuit
7b10410a70 [Ci skip] A small change 2020-09-13 11:38:04 +02:00
Silent
03f7e64107 Fixed colors & functionality of cheat sheet 2020-09-12 15:19:07 +02:00
TheBusyBiscuit
8f95cb4f84
[CI skip] Merge pull request #2311 from poma123/fix/typos 
Fixed some typos
 2020-09-11 20:48:20 +02:00
poma123
acd26b68dd We can use useable anyway 2020-09-11 20:29:23 +02:00
poma123
be5f793695 Fixed a bunch of typos 2020-09-11 20:02:17 +02:00
TheBusyBiscuit
e2c021d270
Merge pull request #2310 from LinoxGH/patch-3 
Changed the used sound categories.
 2020-09-11 19:52:48 +02:00
LinoxGH
0177ee13dd
Changed the used SoundCategory. 2020-09-11 20:29:28 +03:00
LinoxGH
ca20594032
Added changed the used SoundCategory. 2020-09-11 20:27:38 +03:00
TheBusyBiscuit
ff9a6f7a3e Fixed Unit Tests 2020-09-11 10:44:00 +02:00
TheBusyBiscuit
ed66ee9b79 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
tags

Conflicts:
	CHANGELOG.md
 2020-09-11 10:33:02 +02:00
NCBPFluffyBear
37c0ce4ce0 Organized imports 2020-09-10 23:52:19 -05:00
TheBusyBiscuit
74edbe499c Fixes #2238 2020-09-11 00:07:26 +02:00
NCBPFluffyBear
128bc65417 Did requested changes 2020-09-10 16:36:52 -05:00
NCBPFluffyBear
57f52f62c6 Did requested changes 2020-09-10 16:27:50 -05:00
NCBPFluffyBear
6b95ed0293 Added Charge Command 2020-09-10 16:02:03 -05:00
TheBusyBiscuit
6fd90bde4f Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags 2020-09-10 16:19:23 +02:00
poma123
d22f7f31d8 Renamed to AsyncMachineProcessCompleteEvent 2020-09-10 14:36:41 +02:00
poma123
6e4ad1345f
This has to be async 2020-09-10 13:58:58 +02:00
TheBusyBiscuit
6c7af43574
Merge pull request #2304 from poma123/develop/machine-process-complete-event 
MachineProcessCompleteEvent
 2020-09-10 12:16:35 +02:00
TheBusyBiscuit
8a3165e9ba Fixed some tags and added glass 2020-09-10 00:33:47 +02:00
TheBusyBiscuit
00e71904b2
Merge pull request #2305 from LinoxGH/patch-3 
Edited markDirty() to clean connectorCache
 2020-09-09 23:33:06 +02:00
LinoxGH
1b80c698c5
Fixed a typo. 2020-09-09 21:36:29 +03:00
TheBusyBiscuit
19c67a2266 Unit Test should no longer fail 2020-09-09 15:52:59 +02:00
LinoxGH
6d6359ce26
Improved the code. 2020-09-09 16:50:04 +03:00
TheBusyBiscuit
9655761ab1 Micro-optimizations Walshy would be proud of 2020-09-09 15:43:44 +02:00
TheBusyBiscuit
035e35a067 Implemented tags in more occurences 2020-09-09 15:34:58 +02:00
poma123
8f34365aaa Removed redundant annotations 2020-09-09 14:51:21 +02:00
poma123
87543ccb83 Fixed javadocs 2020-09-09 14:35:17 +02:00
poma123
a4eb852b19 Added annotations 2020-09-09 14:34:01 +02:00
poma123
25bd60fd0e Fixed a typo 2020-09-09 14:26:01 +02:00
poma123
274c5ada2f Minor improvement 2020-09-09 14:25:47 +02:00
poma123
e628ad2685 Added MachineProcessCompleteEvent 2020-09-09 14:25:20 +02:00
TheBusyBiscuit
f2eeadb24b [CI skip] Some minor changes 2020-09-09 13:18:43 +02:00
TheBusyBiscuit
7fdf10cc8b Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
tags

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PickaxeOfVeinMining.java
 2020-09-08 12:37:25 +02:00
TheBusyBiscuit
3a5c1ee22b [CI skip] Removed deprecated class 2020-09-08 12:22:57 +02:00
TheBusyBiscuit
23143cd576
Merge pull request #2297 from LinoxGH/patch-2 
Possibly fixes #2296.
 2020-09-08 12:06:57 +02:00
TheBusyBiscuit
fe22c5e9ed Fixes #2300 (and deprecated bStats) 2020-09-08 12:06:12 +02:00
Daniel Walsh
53dea5e195 Some good old micro-optimisations 2020-09-07 22:38:23 +01:00
LinoxGH
956d8ed078
Did the requested changes. 2020-09-07 18:47:51 +03:00
TheBusyBiscuit
81a8732f41 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags 2020-09-07 13:06:50 +02:00
TheBusyBiscuit
7c8b8e0c59 Discord webhook, please work 2020-09-07 13:02:59 +02:00
TheBusyBiscuit
4fe2aee565 Another mistake 2020-09-07 13:00:15 +02:00
TheBusyBiscuit
7e7fde9a47 Slight correction 2020-09-07 12:59:38 +02:00
TheBusyBiscuit
3220a124aa Added more Unit Tests 2020-09-07 12:41:04 +02:00
LinoxGH
cdd7dc9232
Forgot to change a small part. 2020-09-07 13:38:12 +03:00
LinoxGH
7cd2e53bf1
Possibly fixes #2296. 2020-09-07 13:22:59 +03:00
TheBusyBiscuit
5b72faddc3 Implemented tags 2020-09-07 11:08:39 +02:00
TheBusyBiscuit
b09c4af900 Added documentation 2020-09-07 03:12:31 +02:00
TheBusyBiscuit
06498e3f63 Added Unit Test and loop detection 2020-09-07 01:13:25 +02:00
TheBusyBiscuit
773996617d Added Tags 2020-09-07 00:31:26 +02:00
TheBusyBiscuit
5c0aba7692 [CI skip] Moved Slimefun repository 2020-09-06 17:19:02 +02:00
Ome_R
490db0d719
Fixed teleporters not functioning if the teleport event is cancelled 2020-09-06 12:22:37 +03:00
Nameless
3b9a42713a Translate researches_zh-CN.yml via GitLocalize 2020-09-06 04:24:14 +00:00
TheBusyBiscuit
4ef4332ffa Translate messages_zh-CN.yml via GitLocalize 2020-09-06 04:24:10 +00:00
TheBusyBiscuit
be5f1ed8ee
Merge pull request #2285 from NCBPFluffyBear/multitool-offhand-fix 
Multitool offhand hunger consumption fix
 2020-09-05 22:15:47 +02:00
FluffyBear
6e33549006 Got rid of the extra imports 2020-09-05 15:11:29 -05:00
FluffyBear
069b183b68 Changed it back 2020-09-05 15:11:08 -05:00
FluffyBear
c9fd33318e Did changes 2020-09-05 11:12:14 -05:00
TheBusyBiscuit
2791da3796 A bit redundant 2020-09-05 15:01:26 +02:00
TheBusyBiscuit
ec9133cf8a Small improvements 2020-09-05 14:45:42 +02:00
TheBusyBiscuit
8061df9b5e [CI skip] More nullability annotations 2020-09-05 13:56:56 +02:00
TheBusyBiscuit
5f897de0b0
[CI skip] Merge pull request #2287 from TheBusyBiscuit/gitlocalize-12867 
messges_es
 2020-09-05 09:57:06 +02:00
Luu7
1c1b2251d0 Translate researches_es.yml via GitLocalize 2020-09-04 20:21:14 +00:00
Luu7
d11145d98c Translate messages_es.yml via GitLocalize 2020-09-04 20:09:41 +00:00
FluffyBear
6f49044998 Applied fix 2020-09-04 10:20:11 -05:00
FluffyBear
6ac3c9698b Fixed dual wielding problem with shears 2020-09-04 09:29:08 -05:00
TheBusyBiscuit
120d3299ee
[CI skip] Merge pull request #2284 from TheBusyBiscuit/gitlocalize-12841 
New pull request
 2020-09-04 10:02:31 +02:00
TheBusyBiscuit
0c3cb5db37
[CI skip] Updated it once again 2020-09-04 10:02:20 +02:00
TheBusyBiscuit
deb9e0c711
[CI skip] Updated translator list 2020-09-04 09:57:34 +02:00
FluffyBear
55bf76799f Got rid of charge command from this branch (Missed something) 2020-09-04 00:54:53 -05:00
FluffyBear
cf1c58dd8b Got rid of charge command from this branch 2020-09-04 00:54:06 -05:00
FluffyBear
90309dabe1 Fixed multitools consuming hunger when used in offhand 2020-09-04 00:46:26 -05:00
FluffyBear
649d4797c9
Merge pull request #1 from TheBusyBiscuit/master 
Update to latest
 2020-09-04 00:40:03 -05:00
Pierre
1ee04e79b3 Translate messages_fr.yml via GitLocalize 2020-09-03 22:17:25 +00:00
amarcais53
d22c14e5a6 Translate researches_fr.yml via GitLocalize 2020-09-03 18:23:24 +00:00
TheBusyBiscuit
26f9e5f7c6 More annotations and refactoring 2020-09-03 17:19:24 +02:00
TheBusyBiscuit
dd9962d3e2 Small improvement, many annotations 2020-09-03 12:24:49 +02:00
TheBusyBiscuit
cc2dd0dd64 Translate messages_ja.yml via GitLocalize 2020-09-03 05:32:59 +00:00
bito-blosh
af89dba9f6 Translate researches_ja.yml via GitLocalize 2020-09-03 05:32:27 +00:00
TheBusyBiscuit
f4869991ca Moved Nether goo to the appropriate package (+ more annotations) 2020-09-02 14:47:32 +02:00
TheBusyBiscuit
4ce4388218 [CI skip] More annotations :o 2020-09-02 13:53:10 +02:00
TheBusyBiscuit
c5630791c0 Added item break sound to some tools 2020-09-02 12:19:18 +02:00
TheBusyBiscuit
d0498f51c5 Translate messages_de.yml via GitLocalize 2020-09-02 10:13:36 +00:00
TheBusyBiscuit
2dfa2f139b Translate researches_de.yml via GitLocalize 2020-09-02 10:13:35 +00:00
TheBusyBiscuit
2fadb47e65
Merge pull request #2277 from TheBusyBiscuit/gitlocalize-12801 
Updated TR localization
 2020-09-02 12:09:48 +02:00
TheBusyBiscuit
3b28545714 Little tweak 2020-09-02 12:08:36 +02:00
TheBusyBiscuit
f1515edae9 Fixed Synthetic Shulker Shells missing 2020-09-02 12:07:16 +02:00
LinoxGH
4fde84d521 Translate researches_tr.yml via GitLocalize 2020-09-02 10:06:23 +00:00
LinoxGH
7db615fb82 Translate messages_tr.yml via GitLocalize 2020-09-02 10:06:20 +00:00
TheBusyBiscuit
8a6e00a402 Even more annotations 2020-09-02 11:53:42 +02:00
TheBusyBiscuit
71322d95a8 More annotations 2020-09-02 11:27:53 +02:00
TheBusyBiscuit
486253973c Renamed to Villager Rune 2020-09-02 11:16:45 +02:00
TheBusyBiscuit
eb9837953c
Delete RangedItemSetting.java 2020-09-02 11:13:16 +02:00
TheBusyBiscuit
7da5b9ad35
Merge branch 'master' into experimental 2020-09-02 10:34:13 +02:00
TheBusyBiscuit
f4091e931b Refactoring and some annotations 2020-09-02 10:31:35 +02:00
TheBusyBiscuit
35c1fa6a23 Fixes #2275 2020-09-01 22:38:22 +02:00
BuildTools
c091c7992f Removed redundancies, added javadocs, fixed formatting 2020-08-31 18:50:35 -05:00
BuildTools
125c3fe60d Updated plugin.yml to include new charge command 2020-08-31 15:34:56 -05:00
BuildTools
16ea468c38 Added command to charge items 2020-08-31 15:31:09 -05:00
TheBusyBiscuit
4a6068b078 Refactoring 2020-08-31 20:38:01 +02:00
TheBusyBiscuit
93ff508603 More refactoring 2020-08-31 20:37:24 +02:00
TheBusyBiscuit
759946f5c3 [Ci skip] Reduced technical debt 2020-08-31 20:18:35 +02:00
TheBusyBiscuit
3d22e42bef
Merge pull request #2270 from LinoxGH/master 
Fixes #2265 <Tested>
 2020-08-31 19:56:05 +02:00
TheBusyBiscuit
8073b5dafb Fixes #2266 2020-08-31 19:49:25 +02:00
LinoxGH
6dba662d4b
Merge branch 'master' into master 2020-08-31 20:34:15 +03:00
TheBusyBiscuit
68b9a0aed8 Fixes #2269 (+ refactoring) 2020-08-31 19:08:15 +02:00
LinoxGH
d95049db27
Did the requested change. 2020-08-31 19:13:23 +03:00
LinoxGH
f740cc7850
Did the requested change. 2020-08-31 19:04:23 +03:00
LinoxGH
fa01e82179
Did the requested changes. 2020-08-31 18:51:21 +03:00
LinoxGH
e2c93c54e5
Fixes #2265 <Tested> 2020-08-31 17:28:26 +03:00
LinoxGH
918edbeeb1
Fixed the javadocs. 2020-08-30 18:42:57 +03:00
LinoxGH
bfc84d03b2
Undid the changes to language files. 2020-08-30 18:26:12 +03:00
LinoxGH
305dd57b39
Did the requested change. 2020-08-30 18:25:08 +03:00
LinoxGH
dffc5758e2
Fixed compilation error. 2020-08-30 18:21:50 +03:00
LinoxGH
a8f6f51724
Added a new message. 2020-08-30 18:15:31 +03:00
LinoxGH
3d0c642477
Added an additional check for Wind Staff 2020-08-30 18:14:39 +03:00
LinoxGH
cdb6eeab96
Did the requested changes. 2020-08-30 18:13:45 +03:00
LinoxGH
e0914af6d9
Fixes #2263 2020-08-30 17:53:39 +03:00
TheBusyBiscuit
6b4f914784 Some more refactoring 2020-08-29 14:20:33 +02:00
TheBusyBiscuit
e3f7e68468 Fixed a merging issue 2020-08-29 14:09:41 +02:00
TheBusyBiscuit
dc233997ae
Merge branch 'master' into refactoring/block-energy 2020-08-29 12:47:50 +02:00
TheBusyBiscuit
ac5d5521ce Fixes #2260 2020-08-28 23:35:11 +02:00
TheBusyBiscuit
ec6f48e374 [CI skip] Refactoring 2020-08-28 23:35:05 +02:00
TheBusyBiscuit
5bef6a9ec8 Fixes #2257 2020-08-28 23:18:43 +02:00
TheBusyBiscuit
9d740436a7
Merge branch 'master' into experimental 2020-08-28 20:53:20 +02:00
TheBusyBiscuit
83b66232fa Fixes #2251 2020-08-28 20:03:45 +02:00
LinoxGH
f371a5fda6
Fixed a stupid issue and added some docs. 2020-08-27 20:53:13 +03:00
LinoxGH
8c1cccc390
Forgot about imports. 2020-08-27 20:33:01 +03:00
LinoxGH
fd665843a0
Did requested changes. 2020-08-27 20:20:13 +03:00
LinoxGH
53abf76a35
Fixed Fluid Pump dupe. 2020-08-27 20:08:02 +03:00
TheBusyBiscuit
f97935b5c7
Deleted unused class 2020-08-27 14:29:02 +02:00
TheBusyBiscuit
fcbae02a4b Fixs #2208 2020-08-27 14:16:09 +02:00
TheBusyBiscuit
4232caf17a [CI skip] Reduced technical debt 2020-08-27 13:16:38 +02:00
TheBusyBiscuit
b9b3d7f504 [CI skip] Removed deprecated class 2020-08-27 13:00:36 +02:00
TheBusyBiscuit
4dab0c5b47 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into refactoring/block-energy 2020-08-26 17:51:43 +02:00
TheBusyBiscuit
3bc943bdb2 Little bit of refactoring 2020-08-26 14:33:40 +02:00
TheBusyBiscuit
c8ab9e8568 Fixes #1022 2020-08-26 14:31:51 +02:00
TheBusyBiscuit
6e6a953009 Fixes #2249 2020-08-26 12:47:08 +02:00
TheBusyBiscuit
2c319d866f Fixed Unit Test 2020-08-25 01:17:11 +02:00
TheBusyBiscuit
dba52edc47 Merge branch 'master' into experimental 2020-08-24 21:12:38 +02:00
TheBusyBiscuit
4bc22ab106 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
into experimental

Conflicts:
	CHANGELOG.md
 2020-08-24 21:12:04 +02:00
TheBusyBiscuit
ecde46616a Climbing Pick no longer causes fall damage 2020-08-24 20:59:01 +02:00
TheBusyBiscuit
89a5db2593 Fixed Unit Tests for Climbing Pick 2020-08-24 20:45:45 +02:00
TheBusyBiscuit
9e92f64222 Added damageable setting 2020-08-24 20:35:35 +02:00
TheBusyBiscuit
8c2038634f Fixed dual wielding climbing picks and added messages 2020-08-24 20:31:54 +02:00
TheBusyBiscuit
b81959e7a0 Added dual-wielding to the Climbing Pick 2020-08-24 20:19:24 +02:00
TheBusyBiscuit
076ae6532b Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-08-24 18:12:31 +02:00
poma123
7b7c6350c6 Fixed android script editor menu hotkey glitch 2020-08-24 15:30:51 +02:00
TheBusyBiscuit
605862b400 Improved consistency and reduced redundancy 2020-08-24 14:26:11 +02:00
TheBusyBiscuit
a2b2478394
Update EnergyNet.java 2020-08-24 02:18:32 +02:00
TheBusyBiscuit
d998f3ec8c
Merge branch 'master' into refactoring/block-energy 2020-08-24 02:11:59 +02:00
TheBusyBiscuit
155092a321 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
Conflicts:
	pom.xml
 2020-08-23 17:57:13 +02:00
TheBusyBiscuit
f51a19777f [CI skip] Added more Unit tests 2020-08-23 17:56:38 +02:00
Sfiguz7
89fdf45d28 I said, fixed extra indentation 2020-08-23 17:50:31 +02:00
Sfiguz7
44451d6244 Fixed extra indentation 2020-08-23 17:49:44 +02:00
Sfiguz7
813200b29c Made requested changes 2020-08-23 15:36:10 +02:00
Sfiguz7
e06d17f8e5 Restored original plugin.yml as pulling hadn't 2020-08-23 13:58:29 +02:00
Sfiguz7
bdd2adc21e Cleared unused imports I forgot to delete 2020-08-23 13:56:39 +02:00
Sfiguz7
eb66f3e183 Added option to drop excess items on /sf give 2020-08-23 13:54:51 +02:00
TheBusyBiscuit
ec95797cbf Fixes #2240 2020-08-22 02:38:17 +02:00
TheBusyBiscuit
b36e3e41a8 Reduced technical debt 2020-08-22 02:36:36 +02:00
TheBusyBiscuit
e839ece670 Reduced technical debt 2020-08-22 00:57:44 +02:00
100petr
d6e519c840 Translate messages_cs.yml via GitLocalize 2020-08-21 13:27:22 +00:00
TheBusyBiscuit
95655dc6fc A few fixes and performance improvements 2020-08-21 15:19:08 +02:00
TheBusyBiscuit
167326292d Maybe fixes #1951 (+ performance improvements) 2020-08-20 23:25:43 +02:00
TheBusyBiscuit
29092b87c9
Merge branch 'experimental' into IcePick 2020-08-20 22:56:09 +02:00
TheBusyBiscuit
d8d4811974 Merged Nitwit Rune and Shulker Shell PRs 2020-08-20 18:20:25 +02:00
TheBusyBiscuit
65021f7615
Merge branch 'rune' into ShulkerShell 2020-08-20 17:33:27 +02:00
TheBusyBiscuit
88be3e79ff
Merge branch 'master' into refactoring/block-energy 2020-08-20 16:55:35 +02:00
LinoxGH
73d623a0fd
Github Web and its indent issues. 2020-08-20 14:39:31 +03:00
LinoxGH
37bacaa8cb
Apparently SlimefunPlugin.instance is private now. 2020-08-20 14:30:21 +03:00
LinoxGH
bf3b04a4c5
Oops sorry for this silly mistake 2020-08-20 14:19:48 +03:00
LinoxGH
0946b88cd1
Fixed symbol name issues in ClimbingPick.java 2020-08-20 14:11:46 +03:00
LinoxGH
a54e8623d3
Merge branch 'master' into ShulkerShell 2020-08-20 12:21:50 +03:00
LinoxGH
5f78e7a854
Merge branch 'master' into IcePick 2020-08-20 11:43:14 +03:00
Vravinite
310622c3ac Translate messages_es.yml via GitLocalize 2020-08-19 23:50:04 +00:00
LinoxGH
5f0df75b81 Translate messages_tr.yml via GitLocalize 2020-08-19 12:42:33 +00:00
TheBusyBiscuit
4f3854877b
[CI skip] Merge pull request #2230 from TheBusyBiscuit/gitlocalize-12659 
Updated Russian localizations
 2020-08-19 14:37:35 +02:00
TheBusyBiscuit
15487fb333 Translate messages_de.yml via GitLocalize 2020-08-19 12:33:36 +00:00
TheBusyBiscuit
9787cf734b Renamed to Nitwit Rune 2020-08-19 14:31:07 +02:00
SoSeDiK
273e459e26 Translate recipes_ru.yml via GitLocalize 2020-08-19 12:20:10 +00:00
SoSeDiK
dbd5cc1641 Translate messages_ru.yml via GitLocalize 2020-08-19 12:20:08 +00:00
TheBusyBiscuit
b1abf7bb99 Fixed categories 2020-08-19 14:12:51 +02:00
TheBusyBiscuit
8c5d15e311 Increased Bartering chance 2020-08-19 14:11:33 +02:00
TheBusyBiscuit
66fa277014 A few additional changes 2020-08-19 14:07:42 +02:00
TheBusyBiscuit
57b3f06aa6
Merge pull request #2220 from dniym/NitwitRune 
Added Rune of Unemployment
 2020-08-19 13:58:16 +02:00
TheBusyBiscuit
aa22e7c9b2 [CI skip] A bit of refactoring and documentation 2020-08-19 13:54:46 +02:00
dniym
e13e7e1400
Update RuneOfUnemployment.java 
made requested changes
 2020-08-18 15:30:12 -04:00
TheBusyBiscuit
9d4d2060ba [CI skip] Added a few more strings to translation files 2020-08-18 14:45:51 +02:00
TheBusyBiscuit
6be0709aea Fixes #2138 2020-08-18 14:18:44 +02:00
TheBusyBiscuit
85b0c80e3f Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-08-17 17:31:39 +02:00
TheBusyBiscuit
8e8a87fce6 Fixed ChestTerminal timings showing up as cargo nodes 2020-08-17 17:31:15 +02:00
TheBusyBiscuit
fb47574fe8
Added poma's requested change 
Co-authored-by: poma123 <25465545+poma123@users.noreply.github.com>
 2020-08-17 16:27:26 +02:00
TheBusyBiscuit
a10813036b
Added poma's suggested change 
Co-authored-by: poma123 <25465545+poma123@users.noreply.github.com>
 2020-08-17 13:30:18 +02:00
TheBusyBiscuit
0f73b62658
Added Walshys suggested change 
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
 2020-08-17 13:30:03 +02:00
TheBusyBiscuit
07c62d5932
Added Walshys suggested change 
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
 2020-08-17 13:29:54 +02:00
TheBusyBiscuit
33f6f039ec
Added Walshys suggested change 
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
 2020-08-17 13:29:44 +02:00
Scott Gomez Andoy
646fb6d523 Translate messages_tl.yml via GitLocalize 2020-08-17 11:26:10 +00:00
TheBusyBiscuit
d4953dd029 [CI skip] Added more Unit Tests 2020-08-17 13:00:22 +02:00
TheBusyBiscuit
0d27a787ab Added a new config option for setting Players on fire when radioactive 2020-08-17 02:23:59 +02:00
TheBusyBiscuit
1bba2efa3e [CI skip] Added more unit tests 2020-08-17 02:23:28 +02:00
TheBusyBiscuit
7a31c88ce9 Fixes #2207 2020-08-17 00:32:18 +02:00
TheBusyBiscuit
c98fe74ea9
Merge branch 'master' into NitwitRune 2020-08-17 00:25:18 +02:00
dniym
42e4b1620d
Update SlimefunItemSetup.java 
Fixed merge conflict 2
 2020-08-16 13:52:09 -04:00
dniym
45b63a149b
Update HeadTexture.java 
Resolved Merge Conflict 1
 2020-08-16 13:45:18 -04:00
dniym
b22bdb55ff Made requested changes 2020-08-16 13:33:36 -04:00
TheBusyBiscuit
2a8abcbdbf Fixed unit tests, also improved test coverage 2020-08-16 15:57:09 +02:00
TheBusyBiscuit
037e8d83df Small performance improvement, also reduced technical debt a bit 2020-08-16 15:49:47 +02:00
Luu7
9a6b8d697d Translate messages_es.yml via GitLocalize 2020-08-14 21:53:14 +00:00
TheBusyBiscuit
bae8421511 Translate messages_de.yml via GitLocalize 2020-08-13 23:51:00 +00:00
TheBusyBiscuit
8b02c18bb4 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-08-14 01:46:25 +02:00
TheBusyBiscuit
eb5b2678e0 Fixes #2077 2020-08-14 01:46:05 +02:00
dniym
644878c534 Made Requested Changes 2020-08-13 16:21:18 -04:00
LinoxGH
acfc3c6880 Translate messages_tr.yml via GitLocalize 2020-08-13 19:53:13 +00:00
TheBusyBiscuit
c0d18c5c89 Fixes #2217 2020-08-13 21:13:19 +02:00
dniym
a33cfdb12d added a check for jobless villagers 2020-08-12 16:08:15 -04:00
dniym
a1be08034b made requested changes 2020-08-12 16:04:35 -04:00
dniym
b27059240b Added Rune of Unemployment 
Approved Suggestion: #284 - Vitamin_CE#9804
 2020-08-11 20:58:17 -04:00
TheBusyBiscuit
923b59c6e7 [CI skip] Reduced technical debt 2020-08-11 16:28:52 +02:00
TheBusyBiscuit
e406481b98 [CI skip] Replaced the last tabs with spaces 2020-08-11 16:23:31 +02:00
TheBusyBiscuit
1aaedf0825 [CI skip] Added more Unit Tests 2020-08-11 11:17:08 +02:00
Nameless
517bd6139e Translate messages_zh-CN.yml via GitLocalize 2020-08-10 06:47:24 +00:00
LinoxGH
9175f27fdd Translate messages_tr.yml via GitLocalize 2020-08-09 14:59:09 +00:00
Luu7
adddf4811d Translate messages_es.yml via GitLocalize 2020-08-09 13:07:04 +00:00
TheBusyBiscuit
bb40017985 Translate messages_de.yml via GitLocalize 2020-08-09 09:48:03 +00:00
TheBusyBiscuit
e4f5ea62d9 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-08-09 11:44:03 +02:00
TheBusyBiscuit
485a80f6ef Fixes #2209 2020-08-09 11:41:15 +02:00
TheBusyBiscuit
66f4c48b4b Fixes #2205 2020-08-09 11:33:48 +02:00
TheBusyBiscuit
e6958f8e34
[CI skip] Merge pull request #2210 from TheBusyBiscuit/gitlocalize-12575 
Updated messages_zh-CN.yml
 2020-08-09 11:20:57 +02:00
Nameless
af32c0ed4a Translate recipes_zh-CN.yml via GitLocalize 2020-08-09 08:20:48 +00:00
Nameless
a3f58150ee Translate messages_zh-CN.yml via GitLocalize 2020-08-09 08:17:17 +00:00
TheBusyBiscuit
7de9dd6683 Industrial Miners can now also mine Gilded Blackstone 2020-08-08 12:51:26 +02:00
TheBusyBiscuit
9f49dd3981 Reduced technical debt 2020-08-08 12:47:39 +02:00
TheBusyBiscuit
c08eadcaae Small performance improvement 2020-08-08 00:48:09 +02:00
TheBusyBiscuit
bffbb488ba [CI skip] Added Unit Tests for Piglins 2020-08-08 00:45:01 +02:00
poma123
c2fa590aa1
Requested changes 2020-08-07 22:43:58 +02:00
poma123
6ab196a03d
Requested changes 2020-08-07 22:04:15 +02:00
poma123
87f8e7ae8c
Fixed Industrial Miner debris issue 2020-08-07 21:46:59 +02:00
TheBusyBiscuit
9b21c1ade1
Merge pull request #2202 from dniym/elecPressSand 
Elec press sand
 2020-08-07 19:10:11 +02:00
TheBusyBiscuit
99d07c42e5 [CI skip] Update MockBukkit 2020-08-07 19:05:51 +02:00
dniym
1fde84a4c7 Approved Suggestion #272 - AutoBio#8746 2020-08-06 21:08:59 -04:00
TheBusyBiscuit
9de72881ab [CI skip] Fixed some URLs 2020-08-07 00:31:09 +02:00
TheBusyBiscuit
d55a546c42 Fixes #2168 2020-08-06 16:24:41 +02:00
Vravinite
b0c040ea7a Translate recipes_es.yml via GitLocalize 2020-08-06 07:47:06 +00:00
Luu7
4a45757a53 Translate messages_es.yml via GitLocalize 2020-08-06 07:47:03 +00:00
Luu7
33d802b940 Translate researches_es.yml via GitLocalize 2020-08-06 07:47:02 +00:00
TheBusyBiscuit
8d7d157503 Improved documentation 2020-08-06 00:54:49 +02:00
TheBusyBiscuit
ef01c85888 Some refactoring, requested changes 2020-08-06 00:30:33 +02:00
TheBusyBiscuit
dde0ab7de6
[CI skip] Merge pull request #2197 from TheBusyBiscuit/gitlocalize-12544 
Updated hungarian translations
 2020-08-05 23:39:44 +02:00
TheBusyBiscuit
94843c79c0
[CI skip] Merge pull request #2196 from TheBusyBiscuit/gitlocalize-12540 
Update Japanese translation
 2020-08-05 23:39:18 +02:00
TheBusyBiscuit
a032d151f1
[CI skip] Merge pull request #2195 from TheBusyBiscuit/gitlocalize-12539 
Updated TR localization
 2020-08-05 23:38:52 +02:00
TheBusyBiscuit
e758be8d3c
[CI skip] Merge pull request #2194 from TheBusyBiscuit/gitlocalize-12538 
Tagalog/Filipino Translation Update
 2020-08-05 23:38:28 +02:00
poma123
f89f3a35bb Translate messages_hu.yml via GitLocalize 2020-08-05 21:36:36 +00:00
András Marczinkó
9594046bd5 Translate recipes_hu.yml via GitLocalize 2020-08-05 21:36:35 +00:00
TheBusyBiscuit
c2cc7ab96c Translate messages_ja.yml via GitLocalize 2020-08-05 15:38:07 +00:00
LinoxGH
cd7a94516a Translate messages_tr.yml via GitLocalize 2020-08-05 15:06:58 +00:00
Scott Gomez Andoy
a0fe200948 Translate messages_tl.yml via GitLocalize 2020-08-05 14:54:16 +00:00
TheBusyBiscuit
3d8e01e6f2 Translate messages_de.yml via GitLocalize 2020-08-05 14:52:33 +00:00
TheBusyBiscuit
46a01c368f
Merge pull request #2192 from poma123/fix/brewing 
Fixed prevent Slimefun items from being added to a Brewing Stand
 2020-08-05 16:49:54 +02:00
TheBusyBiscuit
32849ca563
Merge branch 'master' into refactoring/block-energy 2020-08-05 16:45:34 +02:00
TheBusyBiscuit
7c3599c862 [CI skip] Reduced technical debt 2020-08-05 16:44:43 +02:00
TheBusyBiscuit
c168497e79 [CI skip] Reduced technical debt 2020-08-05 13:31:35 +02:00
poma123
9454c890ea Refactoring 2020-08-05 13:02:35 +02:00
poma123
6de4130d05 Fixed prevention when brewing with slimefun items 2020-08-05 12:41:48 +02:00
TheBusyBiscuit
f50d1d2faa Big performance improvements to Enhanced Furnaces when using Paper 2020-08-04 20:15:21 +02:00
TheBusyBiscuit
c56ebe9c23
Merge branch 'master' into IcePick 2020-08-04 19:12:00 +02:00
TheBusyBiscuit
18036aa181
Added a new entry to SlimefunItems.java 2020-08-04 19:07:00 +02:00
TheBusyBiscuit
f8a988261f
Fixed typo 2020-08-04 19:03:20 +02:00
TheBusyBiscuit
3adb634d8b
Make it not override the vanilla item anymore 2020-08-04 19:02:53 +02:00
TheBusyBiscuit
f9e9a7c491
Updated research id to not break compatibility 2020-08-04 19:00:38 +02:00
TheBusyBiscuit
06f64725d9 Improved performance for idling Enhanced Furnaces on Paper 2020-08-04 18:00:31 +02:00
TheBusyBiscuit
9719058bbc Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-08-04 17:59:55 +02:00
TheBusyBiscuit
35684b60fc Optimized performance for rainbow blocks 2020-08-04 17:59:41 +02:00
TheBusyBiscuit
d80fdac23b Fixed debug fish 2020-08-04 15:49:58 +02:00
TheBusyBiscuit
b6ba6ce754 Updated all electric machines 2020-08-04 15:43:00 +02:00
Scott Gomez Andoy
927eefd63c Translate recipes_tl.yml via GitLocalize 2020-08-04 12:46:42 +00:00
TheBusyBiscuit
bc387ee47a Updated EnergyNet code 2020-08-04 13:50:22 +02:00
TheBusyBiscuit
368d2f5798 Move block energy code to EnergyNetComponent 2020-08-04 13:29:45 +02:00
TheBusyBiscuit
736b48a799
Merge pull request #2188 from TheBusyBiscuit/gitlocalize-12525 
Added korean as a language
 2020-08-04 12:54:45 +02:00
TheBusyBiscuit
14f0b0f3fe
[CI skip] Merge pull request #2186 from TheBusyBiscuit/gitlocalize-12523 
Updated german translation
 2020-08-04 12:54:20 +02:00
TheBusyBiscuit
8faf505999
Mark Korean as done 2020-08-04 12:50:48 +02:00
kwonms871
b41ef97859 Translate messages_ko.yml via GitLocalize 2020-08-04 10:48:38 +00:00
LinoxGH
bdde1d9745 Translate recipes_tr.yml via GitLocalize 2020-08-04 10:45:39 +00:00
TheBusyBiscuit
c2443a4df2 Translate recipes_de.yml via GitLocalize 2020-08-04 10:44:15 +00:00
TheBusyBiscuit
e870f82afd Added piglin bartering to translation files 2020-08-04 12:40:08 +02:00
TheBusyBiscuit
8a9dfe25a8 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-08-04 12:30:30 +02:00
TheBusyBiscuit
dbed8b55d9
[CI skip] Merge pull request #2136 from dniym/PiglinDropsFgithub 
Piglin drops fgithub
 2020-08-04 12:25:26 +02:00
TheBusyBiscuit
0ff5fc7251 Small performance improvements for miner talismans 2020-08-04 10:19:24 +02:00
TheBusyBiscuit
eecdb61223 Fixed compilation 2020-08-04 09:53:50 +02:00
TheBusyBiscuit
04a71a2408 Merge branch 'cleanup/blockplacing' of https://github.com/TheBusyBiscuit/Slimefun4 into cleanup/blockplacing 2020-08-04 09:52:59 +02:00
TheBusyBiscuit
7cc795f30e One more change 2020-08-04 09:52:53 +02:00
TheBusyBiscuit
54aa45d1d2
Merge branch 'master' into cleanup/blockplacing 2020-08-04 09:47:51 +02:00
TheBusyBiscuit
484c7a22ec Fixes #2180 2020-08-04 09:46:35 +02:00
TheBusyBiscuit
f409b869ae Small performance optimization for bows 2020-08-04 09:46:04 +02:00
TheBusyBiscuit
137e91ad12
Fixes #2181 2020-08-04 01:16:20 +02:00
TheBusyBiscuit
8f289dcdbe Fixes #2181 2020-08-04 01:15:14 +02:00
TheBusyBiscuit
56b78eac61 Fixes #2183 2020-08-04 00:58:43 +02:00
TheBusyBiscuit
cafa66b1a8 Fixes #2184 2020-08-04 00:48:23 +02:00
TheBusyBiscuit
012a0a7df9 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
into cleanup/blockplacing

Conflicts:
	CHANGELOG.md
 2020-08-03 17:28:17 +02:00
TheBusyBiscuit
d8f5992282 Fixes #2103 2020-08-03 17:25:27 +02:00
TheBusyBiscuit
8d1e427409 A few more changes 2020-08-03 00:30:58 +02:00
dniym
17f84bcffd
Update PiglinBarterDrop.java 
done
 2020-08-02 17:44:57 -04:00
dniym
ecb3a354ff
Update PiglinBarterDrop.java 
fixed
 2020-08-02 17:44:11 -04:00
dniym
9287e1098d
Update PiglinListener.java 
fixed
 2020-08-02 17:43:26 -04:00
TheBusyBiscuit
1aeba31a96 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
into cleanup/blockplacing

Conflicts:
	CHANGELOG.md
 2020-08-02 23:15:05 +02:00
dniym
21305ddfdb
Update PiglinListener.java 
fixed a compile error
 2020-08-02 16:37:19 -04:00
dniym
9edc082230
Update PiglinBarterDrop.java 2020-08-02 16:29:08 -04:00
dniym
c2376b90b3
Update PiglinListener.java 
made requested changes.
 2020-08-02 16:25:39 -04:00
Lleyton Gray
43838d7270
Applying suggestion 
Signed-off-by: Lleyton Gray <lleyton@innatical.com>
 2020-08-02 13:07:55 -07:00
TheBusyBiscuit
1389085932 Fixed Reinforced Spawners 2020-08-02 22:01:32 +02:00
Lleyton Gray
3703aaa993
Add ItemSetting for toggling mining of Ancient Debris. 
Signed-off-by: Lleyton Gray <lleyton@innatical.com>
 2020-08-02 12:52:16 -07:00
TheBusyBiscuit
d20650855c Fixes #2179 2020-08-02 21:45:58 +02:00
TheBusyBiscuit
b26f2a1ca8 Merge branch 'cleanup/blockplacing' of https://github.com/TheBusyBiscuit/Slimefun4 into cleanup/blockplacing 2020-08-02 21:37:03 +02:00
TheBusyBiscuit
a0b9579514 Added ToolUseHandler 2020-08-02 21:36:49 +02:00
lleyton
4c2b6bd1e7
Merge pull request #1 from TheBusyBiscuit/master 
Sync Upstream with Fork
 2020-08-02 12:18:47 -07:00
dniym
eed7b873c7
Update PiglinBarterDrop.java 
made requested changes
 2020-08-02 11:46:46 -04:00
dniym
8305729cfb
Update RandomMobDrop.java 
made requested changes.
 2020-08-02 11:45:19 -04:00
TheBusyBiscuit
6608c3c5d7
Merge branch 'master' into cleanup/blockplacing 2020-08-02 17:43:08 +02:00
TheBusyBiscuit
f32280a4ce Fixes #2176 2020-08-02 17:39:09 +02:00
TheBusyBiscuit
6573a60016 Another commit full of cleanup stuff 2020-08-02 15:16:21 +02:00
TheBusyBiscuit
23d730cd7a Some more refactoring 2020-08-02 14:04:24 +02:00
TheBusyBiscuit
bf65b310aa Fixes #2147 2020-08-02 13:55:58 +02:00
TheBusyBiscuit
34b82d7a6f Fixes #2164 2020-08-02 13:55:31 +02:00
kudansul
f3191658b8 Translate researches_ko.yml via GitLocalize 2020-08-02 11:46:07 +00:00
TheBusyBiscuit
e52d062ef5 Reduced technical debt and clutter 2020-08-02 11:22:00 +02:00
Lleyton Gray
fadb31feb1
Allow Ancient Debris to be mined by Industrial Miners 2020-08-01 20:47:43 -07:00
TheBusyBiscuit
0f924e485b
[CI skip] Merge pull request #2159 from TheBusyBiscuit/gitlocalize-12482 
Categories_it
 2020-08-01 16:58:41 +02:00
TheBusyBiscuit
c8c3edb66c
[CI skip] Merge pull request #2157 from TheBusyBiscuit/gitlocalize-12480 
Researches_it
 2020-08-01 16:58:26 +02:00
TheBusyBiscuit
a472097798 Fixed androids rotating to the wrong side 2020-08-01 16:16:15 +02:00
TheBusyBiscuit
72a3f59d4b Removed a deprecated method 2020-08-01 15:56:14 +02:00
TheBusyBiscuit
6580e82606 Removed deprecated things 2020-08-01 12:31:05 +02:00
TheBusyBiscuit
c510a8708c Performance improvements for androids 2020-08-01 12:25:47 +02:00
TheBusyBiscuit
76362b2acb Fixes #2166 2020-08-01 00:17:43 +02:00
TheBusyBiscuit
2fc18aed0a Fixes #2162 2020-07-31 20:24:58 +02:00
TheBusyBiscuit
e380f8b972 Fixes #2165 2020-07-31 20:18:51 +02:00
TheBusyBiscuit
446191d4bf Fixes #2156 2020-07-31 20:14:48 +02:00
prolletto64
bf3a0391d0 Translate categories_it.yml via GitLocalize 2020-07-31 13:43:17 +00:00
prolletto64
db424e0437 Translate researches_it.yml via GitLocalize 2020-07-31 13:41:59 +00:00
dniym
80ee551ca2 Made requested changes. 2020-07-30 20:14:14 -04:00
Scott Gomez Andoy
5d22bfb109 Translate recipes_tl.yml via GitLocalize 2020-07-30 23:59:34 +00:00
TheBusyBiscuit
df4f316675 Minor change 2020-07-31 01:39:10 +02:00
TheBusyBiscuit
90685edae6 Added a permission node for the debug fish 2020-07-31 01:32:43 +02:00
TheBusyBiscuit
dcb00dff20 [CI skip] Reduced technical debt 2020-07-31 01:08:23 +02:00
TheBusyBiscuit
2f05b9e4f8 Various fixes and performance improvements, mainly for talismans 2020-07-30 17:20:21 +02:00
SoSeDiK
8ddb055083 Translate researches_ru.yml via GitLocalize 2020-07-30 11:45:13 +00:00
SoSeDiK
2999e777f9 Translate messages_ru.yml via GitLocalize 2020-07-30 11:45:09 +00:00
TheBusyBiscuit
771456b6cd [CI skip] Fixed some malformed yaml 2020-07-30 13:30:20 +02:00
TheBusyBiscuit
a363cd1f5f
[CI skip] Removed trailing-spaces from config 2020-07-30 13:24:56 +02:00
TheBusyBiscuit
0412a2aec1 Fixes #2151 2020-07-30 10:23:44 +02:00
TheBusyBiscuit
ce18519808 Re-added conditional github warning messages 2020-07-29 23:21:41 +02:00
TheBusyBiscuit
ac4cfd3d68 Fixes #2145 2020-07-29 21:57:08 +02:00
TheBusyBiscuit
5a1b868c91 Fixed Metrics 2020-07-29 13:13:48 +02:00
TheBusyBiscuit
eb8e689d2c Fixes #2143 2020-07-29 13:03:52 +02:00
TheBusyBiscuit
8f2dc7cebc [Ci skip] Fixed formatting 2020-07-29 12:39:04 +02:00
TheBusyBiscuit
aba4019da0 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-07-29 12:37:33 +02:00
TheBusyBiscuit
2c3343ac5f [Ci skip] Fixed Metrics? 2020-07-29 12:37:16 +02:00
Nameless
08412f3c6c Translate researches_zh-CN.yml via GitLocalize 2020-07-28 01:16:18 +00:00
Nameless
641d24d48d Translate messages_zh-CN.yml via GitLocalize 2020-07-28 01:16:15 +00:00
TheBusyBiscuit
3573628621 Translate messages_hu.yml via GitLocalize 2020-07-26 23:00:23 +00:00
András Marczinkó
d01dadfa42 Translate researches_hu.yml via GitLocalize 2020-07-26 23:00:22 +00:00
dniym
4f5c1f6760 made requested changes 2020-07-26 12:06:06 -04:00
dniym
260a6f4f61 forgot one 2020-07-26 10:51:18 -04:00
dniym
65f8519805 made requested changes 2020-07-26 10:49:41 -04:00
dniym
ba8aafe312 made requested changes 2020-07-26 10:20:17 -04:00
TheBusyBiscuit
63569fac57 Reduced technical debt and refactored a bit 2020-07-26 13:03:33 +02:00
TheBusyBiscuit
8eb75ecbc8
Merge pull request #2134 from poma123/patch-2 
Backwards-compatibility mode disabled on new servers
 2020-07-26 12:23:22 +02:00
dniym
22a0623485 fixed formatting 2020-07-25 20:41:27 -04:00
dniym
9093e292a1 Rebased and re-commital of Piglin barter recipe addition. 2020-07-25 20:38:15 -04:00
bito-blosh
d1224b2d44 Translate resources_ja.yml via GitLocalize 2020-07-25 23:03:32 +00:00
bito-blosh
cb439b5aee Translate messages_ja.yml via GitLocalize 2020-07-25 23:03:31 +00:00
bito-blosh
9e317e8c4e Translate researches_ja.yml via GitLocalize 2020-07-25 23:03:30 +00:00
poma123
0d11d5ae89 Requested changes 2020-07-26 00:33:33 +02:00
poma123
b8d399a92c World-changing fix 2020-07-26 00:22:58 +02:00
poma123
ea2795d5b7 Implemented requested changes 2020-07-26 00:20:59 +02:00
poma123
e9650c1ca6
Revert the changed config 2020-07-25 23:58:18 +02:00
poma123
46998740fe
Update config.yml 2020-07-25 23:25:31 +02:00
TheBusyBiscuit
3ef6e2066a
Fixed a typo 2020-07-25 23:15:24 +02:00
TheBusyBiscuit
c717c0e4ce
[CI skip] Merge pull request #2130 from TheBusyBiscuit/gitlocalize-12447 
Updated researches for chinese (Taiwan)
 2020-07-25 15:39:47 +02:00
LinoxGH
8844ec17d7 Translate researches_tr.yml via GitLocalize 2020-07-25 13:36:45 +00:00
LinoxGH
8230987cfc Translate messages_tr.yml via GitLocalize 2020-07-25 13:36:44 +00:00
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
LinoxGH
3b17874ea2
Merge branch 'experimental' into IcePick 2020-07-24 19:39:59 +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
LinoxGH
ca2c068e7a
Merge branch 'experimental' into IcePick 2020-07-06 20:13:18 +03: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
TheBusyBiscuit
613dc7b328
Merge branch 'master' into experimental 2020-07-05 16:54:06 +02: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