Skip to content

Commit

Permalink
General resource refactoring to increase mono compatibility. Help #180.
Browse files Browse the repository at this point in the history 
* All resources was converted to embbed and all specific form resource was removed.
  • Loading branch information
@fabianosan
fabianosan committed Sep 1, 2014
1 parent f486942 commit 32cdf4c
Show file tree
Hide file tree
Showing 15 changed files with 2,862 additions and 979 deletions.
25 changes: 12 additions & 13 deletions RocksmithTookitGUI/DLCConverter/DLCConverter.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

426 changes: 0 additions & 426 deletions RocksmithTookitGUI/DLCConverter/DLCConverter.resx
View file

Large diffs are not rendered by default.

15 changes: 7 additions & 8 deletions RocksmithTookitGUI/DLCInlayCreator/DLCInlayCreator.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 0 additions & 13 deletions RocksmithTookitGUI/DLCInlayCreator/DLCInlayCreator.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,17 +117,4 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="picFlipY.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAATJJREFUOE+V079K
w1AUBvBCH6BTV1ehm0tB3GpxqqNOopQOgi4lGpAsjVPEEpCmFAJ1EEEqROiUP0gIZJAmQ7dCnqFTH6Dw
+RlJQSzhZvjB5R7Od3NzkhKAUhGmadbIz3qEmw3DqJBOa2L/78FCAbqud2jpOA6SJAHXYgGaptUpsiwL
s9kM8/kcURSBe/kBqqpWaTwajWDbNuI4RhiGCIIgxdr2AEVRyiTRajKZpKf6vg/P8+C67gbr/wNkWW7Q
giCi0EvMG7PQFIQC7p6PG7QgiNh6he6wWSaJVk8fbUy/eluxnj/Gy8eDKo1vhkfov5/h5bP7B2tiH9J5
b69OkTQ4xMPbKQbTixT3xAKye57c7nZoed3fx/1rC1wXC/gJal3tVEinNRUPyJ6m2a7WaPM7fwN/pcLa
8YYGbwAAAABJRU5ErkJggg==
</value>
</data>
</root>
3 changes: 1 addition & 2 deletions RocksmithTookitGUI/DLCPackerUnpacker/DLCPackerUnpacker.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

6 comments on commit 32cdf4c

@cozy1
Copy link
Contributor

@cozy1 cozy1 commented on 32cdf4c Sep 1, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This broke some code. See if working now.

@fabianosan
Copy link
Contributor Author

@fabianosan fabianosan commented on 32cdf4c Sep 1, 2014 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cozy1
Copy link
Contributor

@cozy1 cozy1 commented on 32cdf4c Sep 1, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well actually, yes your change did break some code. Your change caused this problem found in Issue#189.

"I was able to capture the command window with a screenshot and it says:
"Error encountered:
Die Datei oder Assembly "Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad[...]" oder eine Abhängigkeit davon wurde nicht gefunden. Die gefundene Manifestdefinition der Assembly stimmt nicht mit dem Assemblyverweis überein. (Ausnahme von HRESULT: 0x8[...]"

But now problem is fixed.

@fabianosan
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well actually, yes your change did break some code. Your change caused this problem found in Issue#189.

No, my changes doesn't affected this issue, I don't changed anything that you can be solved with your change: 11b9891

This issue is about the NewtonSoft.Json version that are changed by @L0FKA in his change: f7f284b

:)

@L0FKA
Copy link
Member

@L0FKA L0FKA commented on 32cdf4c Sep 1, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup. I failed with update for JSON also will do validation foк phrases soon :)

@cozy1
Copy link
Contributor

@cozy1 cozy1 commented on 32cdf4c Sep 1, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, thanks

Please sign in to comment.