github/RoughlyEnoughItems.git/forge, branch 10.x-1.19.3 Unnamed repository; edit this file 'description' to name the repository. Merge remote-tracking branch 'shedaniel/9.x-1.19' into 10.x-1.19.3 2023-06-01T08:58:17+00:00 shedaniel daniel@shedaniel.me 2023-06-01T08:58:17+00:00 a6e09ed07e4079cc1bfa10776b79d4a32bca941e 






Fix merge conflicts
2023-06-01T08:57:01+00:00

shedaniel
daniel@shedaniel.me

2023-06-01T08:56:31+00:00

31d1e1935eae254ba2ff18df57dcd8ad9d9b0fa5












Fix #1398
2023-06-01T08:55:08+00:00

shedaniel
daniel@shedaniel.me

2023-05-30T04:32:54+00:00

6acbfba77bce42994f462fdcc06ffd985d8642af












Merge remote-tracking branch 'shedaniel/9.x-1.19' into 10.x-1.19.3
2023-05-29T06:13:31+00:00

shedaniel
daniel@shedaniel.me

2023-05-29T06:13:31+00:00

c2d352636f871631b1f4d4622b6c28daffef5541

# Conflicts:
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListSearchManager.java





# Conflicts:
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListSearchManager.java







Improve search performance
2023-05-29T04:38:24+00:00

shedaniel
daniel@shedaniel.me

2023-05-29T04:38:01+00:00

4b8675eda54b16c5b5f4a03eed9eb31ea5cadd4f












Merge remote-tracking branch 'origin/9.x-1.19' into 10.x-1.19.3
2023-01-21T16:20:20+00:00

shedaniel
daniel@shedaniel.me

2023-01-21T16:14:52+00:00

140e9148743dbe2469c2c6783f83057aaa2d3565

# Conflicts:
#	default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/CommandSender.java
#	fabric/src/main/java/me/shedaniel/rei/impl/client/fabric/CommandSenderImpl.java
#	forge/src/main/java/me/shedaniel/rei/impl/client/forge/CommandSenderImpl.java





# Conflicts:
#	default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/CommandSender.java
#	fabric/src/main/java/me/shedaniel/rei/impl/client/fabric/CommandSenderImpl.java
#	forge/src/main/java/me/shedaniel/rei/impl/client/forge/CommandSenderImpl.java







Add support for c:hidden_from_recipe_viewers
2023-01-21T16:14:02+00:00

shedaniel
daniel@shedaniel.me

2023-01-21T16:08:47+00:00

7dac5856acd5a1b4111f009d3c348a501f1bc397












Update license to 2023
2023-01-21T16:12:42+00:00

shedaniel
daniel@shedaniel.me

2023-01-21T14:58:29+00:00

3426ed6edef377ad690c44be3997a9be73df1638












Update to 1.19.3
2022-12-08T18:56:21+00:00

shedaniel
daniel@shedaniel.me

2022-12-08T18:56:21+00:00

75020d8ffd08bca7404cc3fbd713e314d7b45324












Merge remote-tracking branch 'origin/9.x-1.19' into feature/1.19.3
2022-11-09T14:23:11+00:00

shedaniel
daniel@shedaniel.me

2022-11-09T14:22:39+00:00

a932ccf66dc4f0b14de780879b00e4d4a9ea1f0c