Martin Robertz
|
51300d1110
|
Merge remote-tracking branch 'slprime/chain_collapse' into dev
|
2025-11-07 22:28:56 +01:00 |
|
slprime
|
9427fcea59
|
Correctly collapse recipe
|
2025-11-07 23:20:39 +02:00 |
|
 slprimeandMartin Robertz
|
541c0e2def
|
Add 'Bookmark recipe with count' Option (#776)
Co-authored-by: Martin Robertz <[email protected]>
|
2025-11-07 19:54:09 +02:00 |
|
Martin Robertz
|
1d7d06b81a
|
Merge remote-tracking branch 'slprime/optimize_loading' into dev
|
2025-11-07 18:37:32 +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 |
|
slprime
|
672950792a
|
Optimizing cross-dimension loading
|
2025-11-07 18:02:58 +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 |
|
 slprimeandMartin Robertz
|
2f0de0b6a8
|
Add 'Show only favorites' option to the 'Craftables' panel (#800)
Co-authored-by: Martin Robertz <[email protected]>
|
2025-11-06 17:37:00 +02:00 |
|
sisyphussy
|
32bc29e654
|
Remove glBlitFramebuffer (#801)
|
2025-11-06 14:36:30 +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 |
|
 slprimeandMartin Robertz
|
ef8a7d8bd5
|
Create normalizeRecipeQueryStack (#772)
Co-authored-by: Martin Robertz <[email protected]>
|
2025-11-05 23:15:45 +02:00 |
|
 slprimeandMartin Robertz
|
adc5a5df16
|
Add GuiOverlapSlots for subpanels (#799)
Co-authored-by: Martin Robertz <[email protected]>
|
2025-11-05 21:55:33 +02: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
|
a828ff227a
|
Remove try/catch from static block (#797)
|
2025-11-05 19:08:55 +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
|
9b6f98330e
|
Remove Permutations from Output (#777)
|
2025-11-05 19:14:48 +02:00 |
|
slprime
|
667c8cb5b6
|
Implement Dynamic Handler Height (#792)
|
2025-11-05 19:00:09 +02:00 |
|
 slprimeandMartin Robertz
|
a186f69444
|
Fix favorite state refresh (#787)
Co-authored-by: Martin Robertz <[email protected]>
|
2025-11-04 23:11:00 +01:00 |
|
slprime
|
16f4f20239
|
Fixed small mouse movement while double-clicking causing drop all items (#793)
|
2025-11-04 23:10:43 +01:00 |
|
slprime
|
bac207cacb
|
Change item slot size in GuiRecipe (#789)
|
2025-11-04 23:10:32 +01: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
|
630e856d83
|
Fix hotkeys when keyBinding disabled (#786)
|
2025-10-30 10:17:16 +02:00 |
|
slprime
|
42d96aed0c
|
Show 'Delete Item' tooltip in Creative Mode (#785)
|
2025-10-29 21:47:34 +01:00 |
|
 slprimeandsisyphussy
|
bd6384bf24
|
Сalculate the height of the container before scrolling to the recipe (#782)
Co-authored-by: sisyphussy <[email protected]>
|
2025-10-29 07:52:33 +00:00 |
|
slprime
|
af9726d356
|
Fixed shift+scroll of ingredients in the recipe GUI (#783)
|
2025-10-29 07:42:18 +00: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 |
|
 slprimeandWilhelm Schuster
|
7cb94fb22a
|
Clear rawText before formatting (#780)
Co-authored-by: Wilhelm Schuster <[email protected]>
|
2025-10-25 15:20:28 +02:00 |
|
 DarkShadow44andMartin Robertz
|
9760fd3eaf
|
Fix another race condition, affecting IndustrialGrafter (#779)
Co-authored-by: Martin Robertz <[email protected]>
|
2025-10-25 14:11:49 +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 |
|
slprime
|
1054871982
|
Add Scroll to Recipe Catalysts (#770)
|
2025-10-21 12:28:14 +00:00 |
|
slprime
|
d90a667f68
|
Fix Bookmarks Chain Tooltip Height (#773)
|
2025-10-19 21:33:46 +03:00 |
|
slprime
|
69e6df5848
|
Fix Button Texture (#771)
|
2025-10-19 19:56:23 +02:00 |
|
slprime
|
25fa7ce44e
|
Add defaultbookmarkcontainers.cfg (#769)
|
2025-10-19 16:07:45 +03:00 |
|