Commit Graph

110 Commits

Author SHA1 Message Date
XianYuFish001
0e29be2eff Merge remote-tracking branch 'upstream/1.21.1' into 1.21.1merged
# Conflicts:
#	build.gradle
#	gradle.properties
#	src/main/java/com/extendedae_plus/ExtendedAEPlus.java
#	src/main/java/com/extendedae_plus/client/ClientProxy.java
#	src/main/java/com/extendedae_plus/client/InputEvents.java
#	src/main/java/com/extendedae_plus/config/ModConfig.java
#	src/main/java/com/extendedae_plus/init/ModBlockEntities.java
#	src/main/java/com/extendedae_plus/init/ModBlocks.java
#	src/main/java/com/extendedae_plus/integration/RecipeViewer/jei/JeiClientBootstrap.java
#	src/main/java/com/extendedae_plus/integration/jei/JeiRuntimeProxy.java
#	src/main/java/com/extendedae_plus/mixin/ae2/EncodedPatternItemMixin.java
#	src/main/java/com/extendedae_plus/mixin/ae2/menu/CraftConfirmMenuGoBackMixin.java
#	src/main/java/com/extendedae_plus/mixin/recipeViewer/MixinEncodingHelper.java
#	src/main/java/com/extendedae_plus/network/CraftingMonitorJumpC2SPacket.java
#	src/main/java/com/extendedae_plus/network/ProvidersListS2CPacket.java
#	src/main/java/com/extendedae_plus/network/ToggleAdvancedBlockingC2SPacket.java
#	src/main/java/com/extendedae_plus/network/ToggleSmartDoublingC2SPacket.java
#	src/main/java/com/extendedae_plus/wireless/WirelessSlaveLink.java
#	src/main/resources/assets/extendedae_plus/lang/en_us.json
#	src/main/resources/assets/extendedae_plus/lang/zh_cn.json
#	src/main/resources/extendedae_plus.mixins.json
2025-09-29 16:09:57 +08:00
XianYuFish
65389c4180 使远程打开UI支持mek的menu, 删除了自动上传非处理样板的逻辑 2025-09-28 19:27:10 +08:00
GaLicn
1449df8f8b 1.4.3 2025-09-28 00:30:14 +08:00
GaLicn
f222410f95 jei运行时检查 2025-09-27 23:54:03 +08:00
GaLicn
f727b67ba6 Merge remote-tracking branch 'ae/develop/neoforge_iava' into 1.21.1 2025-09-27 21:04:03 +08:00
C-H716
f910885190 feat: 重新调整实体加速器代码结构,增加可读性;添加实体加速器对appflux存储电量的扣除支持;添加实体加速器是否优先使用磁盘存储能源配置项 2025-09-27 20:59:17 +08:00
GaLicn
d0fa2ff358 Merge remote-tracking branch 'ae/develop/neoforge_iava' into 1.21.1
# Conflicts:
#	src/main/java/com/extendedae_plus/init/ModItems.java
2025-09-27 20:53:27 +08:00
C-H716
a95389e5fa feat: 允许无限盘中放入空的无限盘 2025-09-27 20:22:57 +08:00
C-H716
f60629aadf feat: 请求量pop位置调整 2025-09-27 20:18:13 +08:00
XianYuFish001
e80ed5a55c 重写了recipeViewers的适配,现在可以适配jei了( •̀ ω •́ )✧ 2025-09-27 11:23:50 +08:00
C-H716
fc25e2bd1c feat: 实体加速器界面显示能量是否充足 2025-09-26 22:09:20 +08:00
XianYuFish001
5da1290fc7 Merge remote-tracking branch 'origin/1.21.1' into 1.21.1
# Conflicts:
#	readme.md
2025-09-26 20:14:55 +08:00
XianYuFish001
0ff7ba80dc 扩展了远程打开机器UI的功能, AE啊AE你怎么这么独特<(≧□≦)> 2025-09-26 20:14:16 +08:00
C-H716
9ac7d11813 fix: 修复实体加速器黑名单和倍率名单无法热重载的问题 2025-09-26 17:57:42 +08:00
C-H716
cc9dd480b4 feat: 移植无限盘 2025-09-26 15:52:51 +08:00
XianYuFish
797c2a41c1
哼哼, 似曾相识的文本已经被我毁尸灭迹啦哈哈哈ヾ(≧▽≦*)o 2025-09-26 13:25:59 +08:00
XianYuFish001
7eb9669180 扩展了搜索的功能, 给配方界面也加了快速上传(‾◡◝) 2025-09-26 13:19:06 +08:00
C-H716
0db71d6cc7 feat: 更新实体加速卡材质 2025-09-26 00:34:39 +08:00
C-H716
f77833a339 fix: 修复高级ae支持智能系列mixin构造函数问题 2025-09-26 00:27:18 +08:00
C-H716
3e2b1b84b8 feat: 无限盘材质 2025-09-25 23:41:41 +08:00
GaLicn
7c07dd148a 崩溃 2025-09-25 19:04:57 +08:00
GaLicn
890a6c24ed 删日志 2025-09-25 18:42:38 +08:00
GaLicn
9b2c214d82 频道卡完成 2025-09-25 18:21:13 +08:00
GaLicn
655c17c7f9 样板供应器增加升级槽 2025-09-25 18:13:02 +08:00
GaLicn
6d7e82e793 样板供应器增加升级槽 2025-09-25 18:01:49 +08:00
GaLicn
687432f86f ME接口增加升级槽 2025-09-25 17:17:55 +08:00
GaLicn
a5db537b22 调整布局 2025-09-25 16:54:24 +08:00
GaLicn
d760233070 appliedflux下供应器jade显示 2025-09-25 16:34:02 +08:00
GaLicn
1d4524fb16 appliedflux下供应器jade显示 2025-09-25 16:23:25 +08:00
GaLicn
2a4dd481a0 appliedflux下供应器逻辑 2025-09-25 15:01:47 +08:00
XianYuFish001
cc1ec9fa16 加了忘掉了触发功能的声音(才,才不是在摸鱼呢(>///<)) 2025-09-25 14:04:19 +08:00
XianYuFish001
7fe6d63c03 快捷从EMI配方树界面编写/上传样板 2025-09-25 13:30:19 +08:00
GaLicn
4327ccc67a appliedflux下供应器逻辑 2025-09-25 13:25:44 +08:00
GaLicn
b0684cd354 appliedflux下供应器逻辑 2025-09-24 23:34:14 +08:00
GaLicn
aa0c26246b 样板供应器 2025-09-24 23:19:59 +08:00
GaLicn
5cf2aa991f 样板供应器 2025-09-24 20:52:35 +08:00
XianYuFish001
be3bc1dcf8 修复了服务端打不开的问题 2025-09-24 16:48:13 +08:00
GaLicn
5bd5df3468 me接口频道卡支持 2025-09-24 15:26:18 +08:00
GaLicn
56dcdad91f 频道卡逻辑 2025-09-24 15:10:43 +08:00
XianYuFish
127f015284
Create LICENCE 2025-09-24 14:30:02 +08:00
XianYuFish001
f6b2c8c614 选取和master一样的开源协议,添加readme,添加component工具类 2025-09-24 14:27:25 +08:00
XianYuFish001
1c1eb8bc0c Initial 2025-09-24 14:06:45 +08:00
GaLicn
0571efe2f9 频道卡 2025-09-24 13:04:46 +08:00
GaLicn
47aa90a438 装配矩阵上传核心 2025-09-24 12:42:48 +08:00
C-H716
4de90feae2 fix: 修复背包有网络工具打开实体加速器界面崩溃 2025-09-21 21:31:10 +08:00
C-H716
9c7d49bb7e feat: 调整lang文件 2025-09-21 19:37:46 +08:00
C-H716
9966205aa2 fix: 修复服务端崩溃的问题 2025-09-21 18:16:27 +08:00
C-H716
47c56a91a4 feat: 按zh_cn.json顺序补全并整理en_us.json文本 2025-09-21 14:46:13 +08:00
C-H716
fa850a5187 fix: 修复实体加速器、实体加速卡配方问题 2025-09-21 13:44:32 +08:00
C-H716
0cdfd7cb28 feat: 实体加速器使用1.21版本材质 2025-09-21 02:00:10 +08:00