upstream/NotEnoughEnergistics
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/NotEnoughEnergistics.git synced 2026-10-25 20:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
251 Commits 2 Branches 97 Tags
master
Commit Graph
251 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
vfyjxf 3a3671e0c6 Revert "Update README.md" 
This reverts commit 24b26bbe3b.
 2021-08-24 12:53:26 +08:00
vfyjxf 3980fa2350 fix bug and add avaritiaddons support 2021-08-24 12:51:04 +08:00
vfyjxf d6c7499c2b Merge pull request #8 from vfyjxf/1.12.2 
updata to 1.12.2
 2021-08-23 22:25:06 +08:00
vfyjxf 2a1bf3fb64 Merge remote-tracking branch 'origin/1.12.2' into 1.12.2 2021-08-23 20:57:59 +08:00
vfyjxf 843b303b97 update dev environment to 1.12.2 2021-08-23 20:39:27 +08:00
vfyjxf 67b46b30b6 update dev environment to 1.12.2 2021-08-22 23:36:50 +08:00
vfyjxf c6a2dad0de Merge remote-tracking branch 'origin/1.12.2' into 1.12.2 
# Conflicts:
#	build.gradle
#	src/main/java/com/github/vfyjxf/nee/NotEnoughEnergistics.java
#	src/main/java/com/github/vfyjxf/nee/network/NEENetworkHandler.java
 2021-08-22 23:33:43 +08:00
vfyjxf dc584e9d6c update dev environment to 1.12.2 2021-08-22 23:32:51 +08:00
vfyjxf 657fb6dfba update dev environment to 1.12.2 2021-08-18 22:09:20 +08:00
vfyjxf a646db7b8f Merge pull request #7 from vfyjxf/1.12.2 
update dev environment to 1.12.2
 2021-08-18 21:23:53 +08:00
vfyjxf 1b487f6e2a update dev environment to 1.12.2 2021-08-18 21:21:19 +08:00
vfyjxf 24b26bbe3b Update README.md 2021-08-18 18:26:05 +08:00
vfyjxf e17236336c Merge remote-tracking branch 'origin/main' 2021-08-18 18:16:32 +08:00
vfyjxf 52d3059e43 add BuildCraft support 2021-08-18 18:15:42 +08:00
vfyjxf 81050e999d add BuildCraft support 2021-08-17 22:01:04 +08:00
vfyjxf ae0e23eac5 add mod priority list 1.7.10-1.2.4 2021-08-17 00:28:52 +08:00
vfyjxf 807e8cbdb9 Merge branch 'main' of https://github.com/vfyjxf/NotEnoughEnergistics into main 1.7.10-1.2.3 2021-08-14 20:39:14 +08:00
vfyjxf 949343251e update 
fix item size always equal 1, add more mod support
 2021-08-14 20:39:09 +08:00
vfyjxf 4e2b622431 Delete Config.java 2021-08-13 22:55:35 +08:00
vfyjxf 4c2469f864 Update ThermalExpansionRecipeProcessor.java 2021-08-13 03:25:57 +08:00
vfyjxf d328e9d6d3 update readme 2021-08-13 02:51:43 +08:00
vfyjxf 571204f2d2 Add ThermalExpansion support 2021-08-13 02:48:44 +08:00
vfyjxf a66fed83ed Add gregtech 6 support 2021-08-12 22:11:45 +08:00
vfyjxf 23da96e1aa Add config 
Add item blacklist and item  priority list
1.7.10-1.2.0 		2021-08-11 21:59:56 +08:00
vfyjxf 0a297333c7 fix bug 1.7.10-1.1.2 2021-08-08 17:47:09 +08:00
vfyjxf ded5621028 Updata README 2021-08-08 17:42:04 +08:00
vfyjxf fffc512469 Add TCNEIPlugin support and ThaumicEnergistics support 2021-08-08 17:31:14 +08:00
vfyjxf 5b53c52f71 Merge pull request #6 from GlodBlock/patch-1 
去除specialslot的闪存或数据球
 2021-08-08 16:56:09 +08:00
GlodBlock bceea52c8e Update GregTechRecipeProcessor.java 2021-08-08 16:47:39 +08:00
GlodBlock 2a370f7ace 去除specialslot的闪存或数据球 2021-08-08 15:21:30 +08:00
vfyjxf d6f3cb6a99 Fix bug 1.7.10-1.1.1 2021-08-07 20:02:30 +08:00
vfyjxf 1449d88915 Updata EnderIO support and Forestry support 2021-08-07 19:34:52 +08:00
vfyjxf a69878864f Update README.md 2021-08-07 19:21:49 +08:00
vfyjxf 1fe69a227a Merge pull request #5 from vfyjxf/add-license-1 
Create LICENSE
 2021-08-07 01:47:46 +08:00
vfyjxf 32bcc15e55 Create LICENSE 2021-08-07 01:46:20 +08:00
vfyjxf 6fe81fb10e Updata 2021-08-07 00:08:31 +08:00
vfyjxf b32b9cd024 Add Processing Pattern Terminal Support 2021-08-06 23:27:31 +08:00
vfyjxf 83b408d90a Merge pull request #4 from GlodBlock/compress 
合并同类物品
 2021-08-06 23:06:55 +08:00
GlodBlock e4c5c8f1dd Update build.gradle 2021-08-06 22:55:47 +08:00
GlodBlock 2c7d498bb9 压缩同类物品 2021-08-06 22:52:28 +08:00
vfyjxf d78cfb9302 Merge pull request #2 from GlodBlock/GlodBlock-patch-1 
阻止闪存编程电路板之类的不消耗物品被加入
 2021-08-06 22:09:24 +08:00
GlodBlock 5bb9d6f1cc Merge pull request #2 from GlodBlock/GlodBlock-patch-2 
把forge的库换成gtnh自己搭的库
 2021-08-06 22:05:37 +08:00
GlodBlock 7d47283d18 把forge的库换成gtnh自己搭的库 
比forge要稳定
 2021-08-06 22:05:01 +08:00
GlodBlock 0201f20973 阻止闪存编程电路板之类的不消耗物品被加入 2021-08-06 22:00:02 +08:00
vfyjxf 08442003b6 Update README.md 2021-08-06 16:49:47 +08:00
vfyjxf 35496fd982 Merge branch 'main' of https://github.com/vfyjxf/NotEnoughEnergistics into main 2021-08-06 16:49:05 +08:00
vfyjxf 16c1e04a53 updata README.md 2021-08-06 16:47:36 +08:00
vfyjxf a2e5ba24b1 Update README.md 2021-08-06 16:13:19 +08:00
vfyjxf 44d6686d94 Update README.md 1.7.10-1.0.0 2021-08-06 16:09:52 +08:00
vfyjxf 103d6cbae3 First Commit 2021-08-06 16:07:55 +08:00