1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Commit Graph

3922 Commits

Author SHA1 Message Date
wzpzw5
d76f77cd84
Update BlockPlacer.java 2020-11-18 01:21:59 +00:00
wzpzw5
965e348695
Update BlockPlacer.java 2020-11-17 01:13:03 +00:00
wzpzw5
3db77a0081
Fixed a bug of Duplicate items with BlockPlacer
Fixed a bug of Duplicate items with BlockPlacer's delay
on BlockPlacer place an item, just take out the item when it place,then one in hand and 
another is placed
2020-11-17 00:01:04 +00:00
TheBusyBiscuit
0cdd21f6bb Added a config option to delete excess cargo network items 2020-11-15 16:29:45 +01:00
TheBusyBiscuit
0b9ab8b6cc Fixes #2446 2020-11-14 18:44:07 +01:00
TheBusyBiscuit
503dbc8367 Fixes #2418 2020-11-14 18:32:53 +01:00
TheBusyBiscuit
05e983917a Added CoolerFeedPlayerEvent 2020-11-10 00:36:38 +01:00
TheBusyBiscuit
1d36ca82ba
Merge pull request #2522 from Slimefun/code-quality/abstract-classes
Code quality: Getting rid of abstract energy classes
2020-11-10 00:11:50 +01:00
TheBusyBiscuit
dee7ded9cd
Merge pull request #2537 from Slimefun/gitlocalize-14021
fix of messenge_zh-TW
2020-11-08 23:40:14 +01:00
TheBusyBiscuit
4d00ffc9af Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into code-quality/abstract-classes 2020-11-05 00:08:04 +01:00
TheBusyBiscuit
933bd9d9b9 Merge branch 'code-quality/abstract-classes' of https://github.com/Slimefun/Slimefun4.git into code-quality/abstract-classes 2020-11-05 00:07:50 +01:00
TheBusyBiscuit
f8306f0693 Small addition 2020-11-05 00:07:37 +01:00
TheBusyBiscuit
3170f143a2 Added a config option to disable network visualizations 2020-11-04 11:18:06 +01:00
Wei-Liang Liou
b9f1e6d688 Translate messages_zh-TW.yml via GitLocalize 2020-11-04 10:08:41 +00:00
TheBusyBiscuit
b80d8cfeda
[CI skip] Updated translators 2020-11-03 18:28:08 +01:00
Wei-Liang Liou
b076d9ee64 Translate categories_zh-TW.yml via GitLocalize 2020-11-03 15:33:31 +00:00
TheBusyBiscuit
e7f7a4d392
Merge pull request #2462 from uiytt/canUnlockResearchEvent
Added PlayerPreResearchEvent
2020-11-03 09:41:42 +01:00
uiytt
54ebfbb18c Last formatting fix 2020-11-02 20:06:03 +01:00
TheBusyBiscuit
1c5f2f650b Some refactoring and small fixes 2020-11-02 15:10:56 +01:00
TheBusyBiscuit
be001baa6e
[CI skip] Merge pull request #2508 from Sfiguz7/master
Smallest documentation fix ever
2020-11-02 12:38:37 +01:00
Sfiguz7
22fd9e549f Removed link from brewing stand 2020-11-02 01:04:53 +01:00
TheBusyBiscuit
25c3368ad3
Merge branch 'master' into code-quality/abstract-classes 2020-11-01 21:06:35 +01:00
TheBusyBiscuit
8536965962 Fixes #2517 2020-11-01 20:59:34 +01:00
TheBusyBiscuit
1141a01fd0 Fixes #2519 2020-11-01 20:46:29 +01:00
TheBusyBiscuit
6ced4d166e Fixes #2527 2020-11-01 20:12:34 +01:00
HeroBrineKing
519140ede6 Translate resources_zh-TW.yml via GitLocalize 2020-10-31 11:50:41 +00:00
HeroBrineKing
36460ed11f Translate researches_zh-TW.yml via GitLocalize 2020-10-31 11:50:40 +00:00
HeroBrineKing
7ecdbbc97d Translate recipes_zh-TW.yml via GitLocalize 2020-10-31 11:50:39 +00:00
TheBusyBiscuit
935a36cfbd Translate messages_zh-TW.yml via GitLocalize 2020-10-31 11:50:36 +00:00
HeroBrineKing
5fafac0f84 Translate categories_zh-TW.yml via GitLocalize 2020-10-31 11:50:35 +00:00
TheBusyBiscuit
3bf7dfc1c3
Update recipes_ko.yml 2020-10-31 10:17:59 +01:00
20181241
aa29c33625 Translate recipes_ko.yml via GitLocalize 2020-10-31 09:15:24 +00:00
TheBusyBiscuit
f2200cee44
[CI skip] Merge pull request #2516 from svr333/RenameMessage
Change not-valid to invalid
2020-10-31 10:08:48 +01:00
TheBusyBiscuit
210c8d20f4 Fixes #2499 2020-10-30 22:50:16 +01:00
TheBusyBiscuit
24e344e219 Fixed compatibility 2020-10-30 19:58:31 +01:00
TheBusyBiscuit
a3fb6c044b Fixed logging 2020-10-30 19:54:34 +01:00
TheBusyBiscuit
08d1def90c Fixed a small mistake 2020-10-30 19:50:05 +01:00
TheBusyBiscuit
f197e26a9c Did not mean to make this final yet 2020-10-30 19:42:58 +01:00
TheBusyBiscuit
508b5aa198 Refactored AGenerator 2020-10-30 19:37:39 +01:00
TheBusyBiscuit
d6567e4bfa Refactored AContainer 2020-10-30 19:31:22 +01:00
svr333
33f0d0a4bc Change not-valid to invalid 2020-10-29 15:06:52 +01:00
TheBusyBiscuit
12e7205280 [Ci skip] Added some unit tests 2020-10-28 12:52:23 +01:00
TheBusyBiscuit
28dda7caea
Merge pull request #2473 from CURVX/fix/armor-forge fixes #2469
Fixes ArmorForge
2020-10-28 12:15:34 +01:00
TheBusyBiscuit
6ad3b55e81
Merge pull request #2510 from Mooy1/Fix
Fixes #2509
2020-10-28 12:14:52 +01:00
TheBusyBiscuit
232ee74ceb Fixed contributors menu not showing everyone 2020-10-28 01:01:25 +01:00
TheBusyBiscuit
b3befbda49 Some code cleanup, documentation and paper optimizations 2020-10-28 00:44:35 +01:00
Mooy1
d8d98982b2 Update AContainer.java 2020-10-27 09:13:25 -05:00
Mooy1
7c39dbc3af this gud idk 2020-10-26 09:09:22 -05:00
Mooy1
9f88f24d40
Update src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2020-10-26 08:51:20 -05:00
Mooy1
8608b9223d Fixes 2020-10-25 22:52:27 -05:00