Martin Robertz
e48f5bebf0
Merge remote-tracking branch 'slprime/recipe_with_count' into dev
2025-11-07 22:29:02 +01:00
Martin Robertz
51300d1110
Merge remote-tracking branch 'slprime/chain_collapse' into dev
2025-11-07 22:28:56 +01:00
Martin Robertz
c9b3e64a11
Merge remote-tracking branch 'slprime/move_bookmark_group' into dev
2025-11-07 22:28:51 +01:00
Martin Robertz
e456825bdb
Merge remote-tracking branch 'slprime/crafting_grid' into dev
2025-11-07 22:28:47 +01:00
Martin Robertz
c623885f28
Merge remote-tracking branch 'slprime/bookmark_backup' into dev
2025-11-07 22:28:43 +01:00
Martin Robertz
c70bf58fb5
Merge remote-tracking branch 'slprime/information_permutation' into dev
2025-11-07 22:28:39 +01:00
Martin Robertz
3682a27ff8
Merge remote-tracking branch 'slprime/info_widget_tip' into dev
2025-11-07 22:28:35 +01:00
Martin Robertz
7930fcbe1d
Merge remote-tracking branch 'slprime/optimize_loading' into dev
2025-11-07 22:28:28 +01:00
Martin Robertz
d94d9bf2ce
Merge branch 'master' into dev
...
# Conflicts:
# src/main/java/codechicken/nei/bookmark/BookmarkStorage.java
2025-11-07 22:28:17 +01:00
slprime
9427fcea59
Correctly collapse recipe
2025-11-07 23:20:39 +02:00
slprime
7dd16c01dc
Merge branch 'master' into move_bookmark_group
2025-11-07 22:48:24 +02:00
slprime
7c88c019a9
Merge branch 'master' into crafting_grid
2025-11-07 22:48:10 +02:00
slprime
40dd178e5a
Merge branch 'master' into bookmark_backup
2025-11-07 22:47:41 +02:00
slprime
a828bdca14
Merge branch 'master' into information_permutation
2025-11-07 22:46:11 +02:00
slprime
721e2f1d24
Merge branch 'master' into info_widget_tip
2025-11-07 22:45:53 +02:00
slprime
4585dec533
Merge branch 'master' into optimize_loading
2025-11-07 22:45:38 +02:00
slprime
ac57fa0cf4
Merge branch 'master' into recipe_with_count
2025-11-07 19:51:01 +02:00
Martin Robertz
1d7d06b81a
Merge remote-tracking branch 'slprime/optimize_loading' into dev
2025-11-07 18:37:32 +01:00
Martin Robertz
1e563af521
Merge remote-tracking branch 'slprime/info_widget_tip' into dev
2025-11-07 18:37:18 +01:00
Martin Robertz
c2eb806c29
Merge remote-tracking branch 'slprime/information_permutation' into dev
2025-11-07 18:37:04 +01:00
Martin Robertz
0320ea0176
Merge remote-tracking branch 'slprime/move_bookmark_group' into dev
2025-11-07 18:36:40 +01:00
Martin Robertz
44f6e5418b
Merge remote-tracking branch 'slprime/bookmark_backup' into dev
...
# Conflicts:
# src/main/java/codechicken/nei/bookmark/BookmarkStorage.java
2025-11-07 18:36:15 +01:00
Martin Robertz
e4f9a0d8ec
Merge remote-tracking branch 'slprime/crafting_grid' into dev
2025-11-07 18:35:12 +01:00
Martin Robertz
5b4c17996b
Merge remote-tracking branch 'slprime/recipe_with_count' into dev
2025-11-07 18:34:28 +01:00
slprime
672950792a
Optimizing cross-dimension loading
2025-11-07 18:02:58 +02:00
slprime
ba4876cf88
Add Tooltip for debug option
2025-11-07 11:17:03 +02:00
slprime
3bc7534ae6
Fix Permutations form Information Handler
2025-11-07 10:47:54 +02:00
slprime
c79ee9fc19
Add the ability to move bookmark groups between namespaces
2025-11-06 18:45:23 +02:00
slprime
96256b95d0
Merge branch 'master' into bookmark_backup
2025-11-06 17:39:11 +02:00
slprime
77ebc2a0ee
Merge branch 'master' into crafting_grid
2025-11-06 17:38:55 +02:00
slprime
f2380ee60f
Merge branch 'master' into recipe_with_count
2025-11-06 17:38:23 +02:00
Martin Robertz
2535b64fb7
Merge branch 'master' into bookmark_backup
2025-11-06 06:31:45 +01:00
Martin Robertz
834935b5e5
Merge branch 'master' into crafting_grid
2025-11-06 06:31:36 +01:00
Martin Robertz
1779aa771e
Merge branch 'master' into recipe_with_count
2025-11-06 06:31:27 +01:00
Martin Robertz
d813e900f6
Merge branch 'master' into recipe_with_count
2025-11-05 19:09:30 +01:00
Martin Robertz
027e34a760
Merge branch 'master' into crafting_grid
2025-11-05 19:09:26 +01:00
Martin Robertz
6d6b7369da
Merge branch 'master' into bookmark_backup
2025-11-05 19:09:21 +01:00
slprime
9af6987194
Merge branch 'master' into crafting_grid
2025-11-05 19:27:41 +02:00
slprime
973ae8872f
Merge branch 'master' into recipe_with_count
2025-11-05 19:23:46 +02:00
slprime
a7b3dd2026
Merge branch 'master' into bookmark_backup
2025-11-05 19:15:49 +02:00
slprime
59eefd933b
Backup bookmarks.ini if loading failed
2025-11-04 23:47:55 +02:00
slprime
02c4080763
spotless
2025-11-04 21:19:31 +02:00
slprime
91828ea9f5
Properly clears inventory before filling a recipe
2025-11-04 21:07:21 +02:00
slprime
2201b3264e
split PR
2025-10-29 08:47:56 +02:00
slprime
b6380c4a74
split PR
2025-10-29 08:39:57 +02:00
slprime
9f50932990
supply
2025-10-24 12:31:18 +03:00
slprime
518aad6d37
Add Recipe With Count Option
2025-10-24 12:18:04 +03:00