Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added lots of ui functionality #1

Open
wants to merge 8 commits into
base: master
Choose a base branch
from

Conversation

ImaginaryDevelopment
Copy link

added ability to find populated chunks.
added more name look ups to inventory and item nodes

@jaquadro
Copy link
Owner

Thanks for the updates. Unfortunately no merge tool is willing to merge them outside of a complete replacement of the source code. There were changes after your fork point that tweaked a few different things in forms in order to get Mono compatibility on Macs, and some Anvil support was also added. Could you merge the current trunk and update or reissue your pull request?

@ImaginaryDevelopment
Copy link
Author

Where can I find the changes that happened after my fork point? I'm not seeing any other commits

@jaquadro
Copy link
Owner

If you look at the network tab of the project you'll see how your
branch has evolved relative to the main project. Probably you just
need to fetch and merge the head of the project branch locally, and
then push your changes. I don't know for certain because I haven't
dealt with this aspect of git yet.

On Tue, Feb 21, 2012 at 8:35 AM, ImaginaryDevelopment
[email protected]
wrote:

Where can I find the changes that happened after my fork point? I'm not seeing any other commits


Reply to this email directly or view it on GitHub:
#1 (comment)

Justin Aquadro

@ImaginaryDevelopment
Copy link
Author

ok, the merge should be fully functional now, give it a shot?

@ImaginaryDevelopment
Copy link
Author

it's 4 years later, would you accept a PR that added and integrated an F#
version of the changes?

On Fri, Jan 22, 2016 at 5:48 PM, LordNyriox [email protected]
wrote:

@ImaginaryDevelopment https://github.com/ImaginaryDevelopment This PR
is very old. Do you think you could rebase it or something like that?


Reply to this email directly or view it on GitHub
#1 (comment).

@ghost
Copy link

ghost commented Apr 25, 2016

@ImaginaryDevelopment You should rebase the pr

phit pushed a commit to phit/NBTExplorer that referenced this pull request Apr 14, 2020
*Total -- 77.47kb -> 45.49kb (41.27%)

/NBTExplorer/Resources/edit-code-24.png -- 3.06kb -> 0.53kb (82.58%)
/NBTExplorer/Resources/edit-small-caps-24.png -- 3.11kb -> 0.57kb (81.74%)
/NBTExplorer/Resources/edit-list-24.png -- 2.96kb -> 0.60kb (79.84%)
/NBTExplorer/Resources/selection-input-24.png -- 3.25kb -> 0.66kb (79.59%)
/NBTExplorer/Resources/edit-code-i-24.png -- 3.19kb -> 0.82kb (74.35%)
/NBTExplorer/Resources/amp.png -- 3.38kb -> 1.02kb (69.88%)
/NBTExplorer/Resources/document-i-24.png -- 3.34kb -> 1.09kb (67.31%)
/NBTExplorer/Resources/document-s-24.png -- 3.43kb -> 1.12kb (67.27%)
/NBTExplorer/Resources/document-f-24.png -- 3.33kb -> 1.10kb (67.04%)
/NBTExplorer/Resources/document-l-24.png -- 3.30kb -> 1.10kb (66.65%)
/NBTExplorer/Resources/document-d-24.png -- 3.39kb -> 1.15kb (65.94%)
/NBTExplorer/Resources/document-b-24.png -- 3.40kb -> 1.17kb (65.75%)
/NBTExplorer/Resources/Dead_Bush_256.png -- 3.92kb -> 2.43kb (38%)
/NBTExplorer/Resources/pencil.png -- 1.49kb -> 0.93kb (37.41%)
/NBTExplorer/Resources/Dead_Bush.png -- 0.68kb -> 0.53kb (21.65%)
/NBTExplorer.Installer/Bitmaps/Banner.png -- 0.92kb -> 0.73kb (20.68%)
/NBTExplorer.Installer/Bitmaps/Dialog.png -- 31.33kb -> 29.95kb (4.42%)

Signed-off-by: ImgBotApp <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants