<feed xmlns='http://www.w3.org/2005/Atom'>
<title>github/RoughlyEnoughItems.git/runtime/src, branch 12.x-1.20</title>
<subtitle>Unnamed repository; edit this file 'description' to name the repository.</subtitle>
<link rel='alternate' type='text/html' href='https://git.nea.moe/github/RoughlyEnoughItems.git/'/>
<entry>
<title>Fix menu z-fighting in config screen</title>
<updated>2024-09-24T03:50:41+00:00</updated>
<author>
<name>shedaniel</name>
<email>daniel@shedaniel.me</email>
</author>
<published>2024-09-24T03:50:41+00:00</published>
<link rel='alternate' type='text/html' href='https://git.nea.moe/github/RoughlyEnoughItems.git/commit/?id=91cc0c43de61b97b54477f90710a45bc71b744b9'/>
<id>91cc0c43de61b97b54477f90710a45bc71b744b9</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix inventory highlighter for 1.20</title>
<updated>2024-09-24T03:46:21+00:00</updated>
<author>
<name>shedaniel</name>
<email>daniel@shedaniel.me</email>
</author>
<published>2024-09-24T03:46:21+00:00</published>
<link rel='alternate' type='text/html' href='https://git.nea.moe/github/RoughlyEnoughItems.git/commit/?id=b932bd3224cc66c5503b4d759bf1ae7bea70eb7c'/>
<id>b932bd3224cc66c5503b4d759bf1ae7bea70eb7c</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '9.x-1.19' into 12.x-1.20</title>
<updated>2024-09-24T03:36:20+00:00</updated>
<author>
<name>shedaniel</name>
<email>daniel@shedaniel.me</email>
</author>
<published>2024-09-24T03:36:20+00:00</published>
<link rel='alternate' type='text/html' href='https://git.nea.moe/github/RoughlyEnoughItems.git/commit/?id=0f3e25a5c940f88f2abfa1f860be113a8a3d0c3d'/>
<id>0f3e25a5c940f88f2abfa1f860be113a8a3d0c3d</id>
<content type='text'>
# Conflicts:
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/options/configure/PanelBoundariesConfiguration.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/options/preview/TooltipPreviewer.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryHighlighter.java
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
# Conflicts:
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/options/configure/PanelBoundariesConfiguration.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/options/preview/TooltipPreviewer.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryHighlighter.java
</pre>
</div>
</content>
</entry>
<entry>
<title>Inventory Search Options</title>
<updated>2024-09-23T08:00:15+00:00</updated>
<author>
<name>shedaniel</name>
<email>daniel@shedaniel.me</email>
</author>
<published>2024-09-04T07:20:49+00:00</published>
<link rel='alternate' type='text/html' href='https://git.nea.moe/github/RoughlyEnoughItems.git/commit/?id=ab5e4c25b4938a00c87029b3b692bb78f5a14017'/>
<id>ab5e4c25b4938a00c87029b3b692bb78f5a14017</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Update Gradle</title>
<updated>2024-09-23T08:00:12+00:00</updated>
<author>
<name>shedaniel</name>
<email>daniel@shedaniel.me</email>
</author>
<published>2024-09-23T07:49:10+00:00</published>
<link rel='alternate' type='text/html' href='https://git.nea.moe/github/RoughlyEnoughItems.git/commit/?id=2a8a1f4a6491daf210bb0bc18abee4530dc9aa8a'/>
<id>2a8a1f4a6491daf210bb0bc18abee4530dc9aa8a</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Update localisation</title>
<updated>2024-09-23T07:24:35+00:00</updated>
<author>
<name>shedaniel</name>
<email>daniel@shedaniel.me</email>
</author>
<published>2024-09-23T06:30:21+00:00</published>
<link rel='alternate' type='text/html' href='https://git.nea.moe/github/RoughlyEnoughItems.git/commit/?id=50e024910e223f41e2e826c193c02ec85a9c256b'/>
<id>50e024910e223f41e2e826c193c02ec85a9c256b</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/11.x-1.19.4' into 12.x-1.20</title>
<updated>2024-09-17T13:37:11+00:00</updated>
<author>
<name>shedaniel</name>
<email>daniel@shedaniel.me</email>
</author>
<published>2024-09-17T13:37:11+00:00</published>
<link rel='alternate' type='text/html' href='https://git.nea.moe/github/RoughlyEnoughItems.git/commit/?id=9856139ad309ab833defb92ccfedaf48b9bde64e'/>
<id>9856139ad309ab833defb92ccfedaf48b9bde64e</id>
<content type='text'>
# Conflicts:
#	api/src/main/java/me/shedaniel/rei/api/common/display/basic/BasicDisplay.java
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
# Conflicts:
#	api/src/main/java/me/shedaniel/rei/api/common/display/basic/BasicDisplay.java
</pre>
</div>
</content>
</entry>
<entry>
<title>Use InstanceHelper to get registryAccess</title>
<updated>2024-09-17T13:36:09+00:00</updated>
<author>
<name>shedaniel</name>
<email>daniel@shedaniel.me</email>
</author>
<published>2024-09-17T13:36:09+00:00</published>
<link rel='alternate' type='text/html' href='https://git.nea.moe/github/RoughlyEnoughItems.git/commit/?id=644c3f591d42d91c8445b199202b37ba05b0bf93'/>
<id>644c3f591d42d91c8445b199202b37ba05b0bf93</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/11.x-1.19.4' into 12.x-1.20</title>
<updated>2024-09-17T06:10:43+00:00</updated>
<author>
<name>shedaniel</name>
<email>daniel@shedaniel.me</email>
</author>
<published>2024-09-17T06:06:55+00:00</published>
<link rel='alternate' type='text/html' href='https://git.nea.moe/github/RoughlyEnoughItems.git/commit/?id=ccf3dcd60aa6c1d079dd57c59d9a89c2ca60b1e7'/>
<id>ccf3dcd60aa6c1d079dd57c59d9a89c2ca60b1e7</id>
<content type='text'>
# Conflicts:
#	default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultSmithingDisplay.java
#	fabric/src/main/resources/roughlyenoughitems.accessWidener
#	forge/src/main/resources/META-INF/accesstransformer.cfg
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
# Conflicts:
#	default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultSmithingDisplay.java
#	fabric/src/main/resources/roughlyenoughitems.accessWidener
#	forge/src/main/resources/META-INF/accesstransformer.cfg
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/9.x-1.19' into 11.x-1.19.4</title>
<updated>2024-09-17T05:50:51+00:00</updated>
<author>
<name>shedaniel</name>
<email>daniel@shedaniel.me</email>
</author>
<published>2024-09-17T05:47:41+00:00</published>
<link rel='alternate' type='text/html' href='https://git.nea.moe/github/RoughlyEnoughItems.git/commit/?id=27e06fad89867281ef7d7bcebff194633812c9da'/>
<id>27e06fad89867281ef7d7bcebff194633812c9da</id>
<content type='text'>
# Conflicts:
#	fabric/src/main/resources/roughlyenoughitems.accessWidener
#	forge/src/main/resources/META-INF/accesstransformer.cfg
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
# Conflicts:
#	fabric/src/main/resources/roughlyenoughitems.accessWidener
#	forge/src/main/resources/META-INF/accesstransformer.cfg
</pre>
</div>
</content>
</entry>
</feed>
