Skip to content

Commit

Permalink
Merge pull request #3153 from manyfold3d/3mf-gem
Browse files Browse the repository at this point in the history
Move 3MF export code into separate mittsu-3mf
  • Loading branch information
Floppy authored Nov 13, 2024
2 parents b897957 + ab9de99 commit 7dc2114
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 17 deletions.
5 changes: 3 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,9 @@ gem "acts_as_favoritor", "~> 6.0"

gem "sqlite3_ar_regexp", github: "manyfold3d/sqlite3_ar_regexp", ref: "rails-7.1-support"

gem "mittsu", github: "manyfold3d/mittsu", ref: "manyfold"
gem "mittsu-mesh_analysis", github: "manyfold3d/mittsu-mesh_analysis"
gem "mittsu", github: "danini-the-panini/mittsu"
gem "mittsu-mesh_analysis"
gem "mittsu-3mf"

gem "view_component", "~> 3.20"

Expand Down
27 changes: 12 additions & 15 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,21 +1,11 @@
GIT
remote: https://github.com/manyfold3d/mittsu-mesh_analysis.git
revision: 7c4df4eca27b32fb1850a19612fa64be5892eebe
specs:
mittsu-mesh_analysis (0.1.0)
mittsu (~> 0.4)

GIT
remote: https://github.com/manyfold3d/mittsu.git
revision: 050afee4cbd326826c08219afbe84c27437cd0f3
ref: manyfold
remote: https://github.com/danini-the-panini/mittsu.git
revision: ba8cf4802277c02bbc264f0d7423a2d38c37b5ee
specs:
mittsu (0.4.0)
builder
chunky_png
ffi
opengl-bindings
rubyzip
opengl-bindings2

GIT
remote: https://github.com/manyfold3d/sqlite3_ar_regexp.git
Expand Down Expand Up @@ -423,6 +413,12 @@ GEM
mini_mime (1.1.5)
mini_portile2 (2.8.7)
minitest (5.25.1)
mittsu-3mf (0.1.0)
builder (~> 3.3)
mittsu (~> 0.4)
rubyzip (~> 2.3)
mittsu-mesh_analysis (0.1.0)
mittsu (~> 0.4)
msgpack (1.7.2)
multi_json (1.15.0)
mutex_m (0.2.0)
Expand Down Expand Up @@ -463,7 +459,7 @@ GEM
omniauth_openid_connect (0.8.0)
omniauth (>= 1.9, < 3)
openid_connect (~> 2.2)
opengl-bindings (1.6.14)
opengl-bindings2 (2.0.2)
openid_connect (2.3.0)
activemodel
attr_required (>= 1.0.0)
Expand Down Expand Up @@ -807,7 +803,8 @@ DEPENDENCIES
logstash-event (~> 1.2)
memoist (~> 0.16.2)
mittsu!
mittsu-mesh_analysis!
mittsu-3mf
mittsu-mesh_analysis
mysql2 (~> 0.5.6)
nanoid (~> 2.0)
omniauth (~> 2.1)
Expand Down

0 comments on commit 7dc2114

Please sign in to comment.