253 Commits
Author SHA1 Message Date
Martin Robertz 967ebd4295 bump version 2022-01-19 17:42:40 +01:00
4gname 958f853c0f fix scroll
(cherry picked from commit f3bb27cf7a6e685f3bc5b60936e75616fff99f83)
1.3.7
2022-01-19 17:39:06 +01:00
Martin Robertz a7919fe707 Merge remote-tracking branch 'vfyjxf/main'
# Conflicts:
#	gradle.properties
#	src/main/java/com/github/vfyjxf/nee/config/NEEConfig.java
2022-01-02 14:14:26 +01:00
Yang XizhiandMartin Robertz 160cecb0bd clean up the libs file (#3)
* enable nei stack by default

* clean up libs file

Co-authored-by: Martin Robertz <[email protected]>
2022-01-02 14:07:33 +01:00
vfyjxf fde98d153e add ae2 recipe support and add a gui to set the count of item that CraftingHelper needs to craft 2022-01-02 16:00:18 +08:00
vfyjxf 512d1fa562 Merge pull request #20 from xstmass/main
Fix NEI GTNH-edition meta bug and added Russian locale
2021-12-25 17:33:26 +08:00
Yang Xizhi c068f8441a enable nei stack by default (#2) 2021-12-23 17:33:39 +01:00
Christmas ce5a76ee68 Fix NEI GTNH meta bug and added ru_RU.lang
Some default code refactor
2021-12-21 03:32:22 +03:00
vfyjxf 7ccf1b0767 Simplify some code 2021-12-19 01:20:51 +08:00
vfyjxf 9963789272 1.add nei drag for ae 2.allow use the ctrl + mouse wheel to change the amount of fake item in Interface 2021-11-13 02:55:04 +08:00
vfyjxf 4fa2a3df0f fix official nei support 2021-11-07 16:43:56 +08:00
vfyjxf ee5cd4568f fix #18 and #17 2021-11-07 15:41:49 +08:00
vfyjxf c211c1e1e4 fix #18 2021-11-06 20:08:41 +08:00
vfyjxf 224456afb1 Add the function of synchronously modifying ingredients 2021-10-31 14:58:31 +08:00
vfyjxf f69a663fce fix #15 and #16 2021-10-31 02:56:09 +08:00
vfyjxf 02b51a24c1 Merge remote-tracking branch 'origin/main' 2021-10-17 03:25:54 +08:00
vfyjxf e921b199b6 add tooltip for wireless crafting terminal 2021-10-17 03:25:39 +08:00
vfyjxf d55dc9d3be update:add wireless crafting terminal support for crafting helper 2021-10-17 03:08:56 +08:00
vfyjxf ac3fa7fcc2 fix bug 2021-10-05 15:35:44 +08:00
vfyjxf 3c579e24ab fix render bug 2021-10-05 11:42:40 +08:00
vfyjxf 2dcead8ebe update:draw highlight for craftable item 2021-10-04 21:45:43 +08:00
vfyjxf 9495bd37ec Merge remote-tracking branch 'origin/main' 2021-10-03 15:48:30 +08:00
vfyjxf 1ef2b0f60e fix bug : crafting helper doesn't check player's inventory 2021-10-03 02:52:47 +08:00
vfyjxf 6338ac9dde fix bug : crafting helper doesn't check player's inventory 2021-10-03 02:48:04 +08:00
vfyjxf 34d9d796aa Merge remote-tracking branch 'origin/main' 2021-10-02 01:37:04 +08:00
vfyjxf f58898df06 fix bug 2021-10-02 01:33:50 +08:00
vfyjxf 287a1556e1 Merge pull request #12 from huige233/patch-2
Create zh_CN.lang
1.7.10
2021-10-01 20:05:54 +08:00
huige 6643bb8843 Create zh_CN.lang 2021-10-01 20:05:11 +08:00
vfyjxf 0bed08ffcd add KeyBindings and crafting helper 2021-10-01 20:01:14 +08:00
vfyjxf f946acc811 update 2021-09-11 16:04:39 +08:00
vfyjxf 3401c2d802 add more commands 2021-09-11 15:58:31 +08:00
vfyjxf 76614e44fb fix bug 2021-09-10 21:16:24 +08:00
vfyjxf 7d10998a74 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	src/main/java/com/github/vfyjxf/nee/NotEnoughEnergistics.java
#	src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHandler.java
#	src/main/java/com/github/vfyjxf/nee/utils/GuiUtils.java
2021-09-04 21:23:38 +08:00
vfyjxf 5dc0c6d338 Add the function of mouse wheel to switch materials 2021-09-04 21:23:00 +08:00
vfyjxf 30fcdb7807 Add the function of mouse wheel to switch materials 2021-09-04 15:22:47 +08:00
vfyjxf 30df907002 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	src/main/java/com/github/vfyjxf/nee/utils/ItemUtils.java
2021-08-29 00:14:20 +08:00
vfyjxf a3ebfd8f5d fix crash caused by item json error 2021-08-29 00:13:58 +08:00
vfyjxf 9ea0e95230 fix crash caused by item json error 2021-08-29 00:02:53 +08:00
vfyjxf b062cac5ed add Processing Pattern Terminal 2021-08-28 00:05:39 +08:00
vfyjxf 52db9ed9ed Merge remote-tracking branch 'origin/main'
# Conflicts:
#	README.md
#	READNE_CN.md
2021-08-27 22:41:01 +08:00
vfyjxf 288a8531af add mouse wheel plugin 2021-08-27 22:37:29 +08:00
vfyjxf f9d4f4e582 Update README.md 2021-08-26 22:23:51 +08:00
vfyjxf 6b0c50985f Create READNE_CN.md 2021-08-26 22:07:13 +08:00
vfyjxf 5eae630710 Update README.md 2021-08-26 22:06:37 +08:00
vfyjxf dfc5185030 add gt++ support 2021-08-25 17:07:13 +08:00
vfyjxf 4c58ec18d3 fix bug 2021-08-24 13:45:43 +08:00
vfyjxf 3b67c8c79a fix bug 2021-08-24 13:44:43 +08:00
vfyjxf f7cf5ced37 Merge remote-tracking branch 'origin/main' 2021-08-24 13:37:40 +08:00
vfyjxf b491d1c395 fix bug 2021-08-24 13:37:31 +08:00
vfyjxf 823bda414e fix bug 2021-08-24 13:36:30 +08:00