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
3,968 Commits 1 Branch 0 Tags 64 MiB
0d11d5ae89
Commit Graph

3968 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TheBusyBiscuit
c212345a92 [CI skip] Updated issue template 2020-07-24 19:23:00 +02:00
TheBusyBiscuit
abc47af565 Fixed exception handling 2020-07-24 19:11:38 +02:00
TheBusyBiscuit
499bbdbf70
Merge branch 'master' into experimental 2020-07-24 16:36:08 +02:00
TheBusyBiscuit
6a11c6af88
[CI skip] Merge pull request #2118 from TheBusyBiscuit/gitlocalize-12439 
Updated hungarian translations
 2020-07-24 16:35:02 +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
cd944e35b8
[CI skip] Updated CHANGELOG 2020-07-24 16:15:43 +02:00
TheBusyBiscuit
ba5eb896f9
[CI skip] Updated README 2020-07-24 16:13:51 +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
Daniel Walsh
d139ba1fa5 Merge branch 'feature/metrics-module' of https://github.com/WalshyDev/Slimefun4 into feature/metrics-module 2020-07-22 20:08:30 +01:00
Daniel Walsh
01b653ff39 Fix the critical game-breaking bug 2020-07-22 20:07:55 +01: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
TheBusyBiscuit
4b4a9c2e11
Merge pull request #2108 from poma123/master 
Added BONE_BLOCK to GrindStone
 2020-07-22 15:32:38 +02:00
TheBusyBiscuit
86c253c929 [CI skip] Updated change log 2020-07-22 15:32:26 +02:00
Daniel Walsh
2646eba615 Small change 2020-07-21 14:51:04 +01:00
Daniel Walsh
f632dee560 Modify changelog 2020-07-21 13:59:48 +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
a1952edde3
Merge pull request #2106 from TheBusyBiscuit/paper 
Optimizations for Paper (cargo network optimizations)
 2020-07-21 10:17:46 +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
TheBusyBiscuit
2d64f37999
Update CHANGELOG.md 2020-07-20 19:33:03 +02:00
TheBusyBiscuit
7554b12c66
[CI skip] Maybe not so useful 2020-07-20 17:40:21 +02:00
TheBusyBiscuit
484f3d7c12
[CI skip] Created CODEOWNERS file 2020-07-20 17:34:56 +02: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
445853bf51 No one saw that 2020-07-20 15:49:59 +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