9
0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2025-12-25 09:59:20 +00:00
Commit Graph

863 Commits

Author SHA1 Message Date
jhqwqmc
d15397bcb5 Merge branch 'Xiao-MoMi:dev' into dev 2025-05-07 21:24:50 +08:00
XiaoMoMi
1858383ec8 修复FAWE //cp //cut 2025-05-07 21:17:05 +08:00
XiaoMoMi
d49e466158 修复1.21.5中键pick物品 2025-05-07 21:08:05 +08:00
XiaoMoMi
c13f01c159 更新语言文件 2025-05-07 20:45:28 +08:00
XiaoMoMi
e221c5a50b 修复1.21.5骨粉 2025-05-07 20:35:07 +08:00
XiaoMoMi
b64d66b47e Merge pull request #165 from Xiao-MoMi/main
更新上游
2025-05-07 20:23:50 +08:00
XiaoMoMi
9ec258c526 缓存一般化 2025-05-07 20:03:36 +08:00
XiaoMoMi
c3bf97a3f5 重构区块缓存 2025-05-07 19:49:21 +08:00
jhqwqmc
500c94c300 Merge branch 'Xiao-MoMi:dev' into dev 2025-05-07 06:22:21 +08:00
XiaoMoMi
1b93704a4e Update gradle.properties 2025-05-07 05:00:35 +08:00
XiaoMoMi
af084ad46c 尝试添加section注入 2025-05-07 04:51:47 +08:00
jhqwqmc
225005e314 Merge branch 'Xiao-MoMi:dev' into dev 2025-05-07 02:08:11 +08:00
XiaoMoMi
7c0d056637 使用线程安全的方法 2025-05-07 02:02:26 +08:00
XiaoMoMi
daf2ac3e8a 提高延迟区域存储的稳定性 2025-05-07 01:54:51 +08:00
XiaoMoMi
b01d564e4f 先改了一半 2025-05-06 20:04:22 +08:00
jhqwqmc
5b025c86ac Merge branch 'Xiao-MoMi:dev' into dev 2025-05-06 19:13:08 +08:00
XiaoMoMi
d2ee1f2957 Merge pull request #161 from jhqwqmc/fawe-compatible
refactor(core): 完全兼容fawe
2025-05-06 19:12:07 +08:00
jhqwqmc
a7a706b680 fix(core): 预防NPE 2025-05-06 19:10:22 +08:00
jhqwqmc
93d09c73ee refactor(core): 完全兼容fawe 2025-05-06 18:57:48 +08:00
jhqwqmc
4c911262d9 Merge branch 'Xiao-MoMi:dev' into dev 2025-05-06 17:12:58 +08:00
XiaoMoMi
22d41bf788 添加debug指令检测注入 2025-05-06 17:10:55 +08:00
jhqwqmc
c96b4470db Merge branch 'Xiao-MoMi:dev' into dev 2025-05-06 16:50:53 +08:00
XiaoMoMi
044735ef0d 更改try catch作用域 2025-05-06 16:21:38 +08:00
jhqwqmc
c829d3454f Merge branch 'Xiao-MoMi:dev' into dev 2025-05-06 16:18:46 +08:00
XiaoMoMi
a1fac1575b 增加BEFORE_CHANGE 2025-05-06 16:14:27 +08:00
XiaoMoMi
39226b67d4 优化FAWE兼容 2025-05-06 16:04:27 +08:00
jhqwqmc
2ba21c2dce refactor(core): 撤销一些修改 2025-05-06 15:47:36 +08:00
jhqwqmc
8ac944edea Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
#	bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/command/feature/ReloadCommand.java
2025-05-06 15:46:13 +08:00
XiaoMoMi
a886e5b38f Merge pull request #160 from jhqwqmc/fawe-hotfix
Fawe hotfix
2025-05-06 15:44:34 +08:00
jhqwqmc
6fe8f31f7c refactor(core): 修改资源包的一些东西 2025-05-06 15:42:59 +08:00
jhqwqmc
066f42f1f4 refactor(core): 修改资源包的一些东西 2025-05-06 15:41:04 +08:00
jhqwqmc
afa3d033dc refactor(core): 修改资源包的一些东西 2025-05-06 15:37:22 +08:00
jhqwqmc
3c9651a1b3 fix(core): 修复非法参数问题 2025-05-06 04:19:20 +08:00
jhqwqmc
c61f6c7e1a fix(core): 修复非法参数问题 2025-05-06 03:21:26 +08:00
jhqwqmc
179f4eb43d fix(core): 修复非法参数问题 2025-05-06 03:19:42 +08:00
jhqwqmc
279afcd0bc fix(core): 修复非法参数问题 2025-05-06 03:13:19 +08:00
jhqwqmc
50bcf85c56 Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
#	bukkit/loader/src/main/resources/translations/en.yml
#	gradle.properties
2025-05-06 03:07:37 +08:00
XiaoMoMi
79c441c0e0 重构context again 2025-05-06 02:34:03 +08:00
jhqwqmc
add7fecd34 fix(core): 修复资源包生成速度过慢的问题 2025-05-05 09:51:11 +08:00
jhqwqmc
82d809ff5a feat(core): 一些对资源包托管和资源包生成的修复 2025-05-05 09:25:29 +08:00
jhqwqmc
99e2d5cd36 feat(core): 一些对资源包托管和资源包生成的修复 2025-05-05 09:02:39 +08:00
jhqwqmc
109205b230 feat(core): 为 SelfHostHttpServer 添加自定义 URL 配置 2025-05-05 01:14:59 +08:00
jhqwqmc
f29b4244e9 Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
#	bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/command/feature/TestCommand.java
2025-05-05 00:14:27 +08:00
XiaoMoMi
dd3e1276ec 增强数字参数 2025-05-04 19:52:26 +08:00
jhqwqmc
769a86424c Merge branch 'Xiao-MoMi:dev' into dev 2025-05-04 17:10:44 +08:00
jhqwqmc
7b2b56e836 fix(network): 修复使用via进服方块选取的问题 2025-05-04 17:09:28 +08:00
XiaoMoMi
5e28d964be 修复team 2025-05-04 15:36:08 +08:00
XiaoMoMi
11642aa1ad 需要时才加载部分依赖 2025-05-04 03:17:15 +08:00
XiaoMoMi
25630d4775 使用更好的条件系统 2025-05-04 02:46:21 +08:00
XiaoMoMi
261e5dcd52 重构条件系统 2025-05-03 21:11:11 +08:00