Nikita Savyolov
22e4c0603b
fix: remove unused imports
2021-10-08 18:35:01 +03:00
Nikita Savyolov
f3b731460e
fix: turtle upgrades item render
2021-10-08 18:31:07 +03:00
Nikita Savyolov
d787c6e6c1
fix: mod name localization
2021-10-08 18:29:55 +03:00
Nikita Savyolov
11272b8d00
style: some spaces and imports
2021-10-07 00:25:18 +03:00
Nikita Savyolov
1c254e3bb0
style: some spaces
2021-10-06 19:13:49 +03:00
Nikita Savyolov
7ade380fad
ci: update java to 16
2021-10-06 18:42:47 +03:00
Nikita Savyolov
2a377a37ee
fix: and another part of syncing with Tweaked codebase and resources
2021-10-03 23:37:43 +03:00
Nikita Savyolov
861a9e199d
fix: another part of syncing with Tweaked codebase
2021-10-03 22:54:13 +03:00
Nikita Savyolov
d4f1e34023
fix: first part of syncing with Tweaked codebase
...
includes: file drag'n'drop (now doesn't work in Tweaked) and no inventory mode for left hand pocket computer
2021-10-03 18:21:42 +03:00
coolsa
6d25278a5c
fixed println, removed .launch configurations.
2021-10-01 23:22:31 -06:00
coolsa
abfb05f04c
fix: Clicking in terminal will now work (tested with paint)
2021-10-01 16:08:08 -06:00
Cloud Chagnon
9d8e76c5b4
Merge pull request #3 from ga2mer/fabric
...
fix: sidebar, textures and lang from Tweaked
2021-10-01 16:07:14 -06:00
Nikita Savyolov
89662bf54a
fix: sidebar, textures and lang from tweaked
2021-10-02 00:24:41 +03:00
Cloud Chagnon
520635dfec
Merge pull request #2 from ga2mer/fabric
...
Pocket, speaker, printer, modems, cable
2021-10-01 14:58:25 -06:00
Nikita Savyolov
ee82a8d75f
fix: pocket, speaker, printer, modems, cable and some mixins
2021-10-01 18:34:42 +03:00
Cloud Chagnon
967f00cd1b
Merge branch 'fabric' into fabric
2021-09-30 16:26:35 -06:00
coolsa
dda5236d84
opening a terminal works, placing blocks does not.
2021-09-30 15:59:20 -06:00
Nikita Savyolov
427ca2f108
fix: turtle read write nbt
2021-10-01 00:53:32 +03:00
Nikita Savyolov
e30f2a86f0
fix: advanced turtle gui interactive and correct turtles tick calling
2021-10-01 00:02:52 +03:00
Nikita Savyolov
121ef6e976
fix: computer, monitor, disk drive and some turtle are works
2021-09-30 14:46:33 +03:00
coolsa
e4271ff6f7
IT COMPILES! but crashes when placing a block.
2021-09-30 04:06:47 -06:00
coolsa
8d3b94734d
Now only need to mess with rendering...
2021-09-30 02:43:57 -06:00
coolsa
9e57150384
Merge in from upstream
2021-09-23 23:33:48 -06:00
coolsa
0dc34a7dbe
Attempting to update to 1.17.
...
Todo: refactor rendering to avoid using direct GL calls, instead I've
read that you could use a `BufferBuilder` but need to do more looking
into that.
Also need to update some block entity things, since some calls are also
gone.
2021-09-23 23:32:06 -06:00
Merith
cbff505297
Merge pull request #67 from 3prm3-Org/readme
...
Fix the badge with a different method using camo.githubusercontent.com
Closes #68
2021-07-10 08:04:07 -07:00
ƐqɿmƐ
c4aef2d4c7
Merge branch 'Merith-TK:fabric' into readme
2021-06-23 14:24:40 -07:00
ƐqɿmƐ
2ed6692f76
Fix the curseforge badge via githubusercontent
...
Replace the svg with https://camo.githubusercontent.com/07622e6662ef5ead080c4840ef6514a34e079d63015f7e51c977a55b1881dfb9/687474703a2f2f63662e776179326d7563686e6f6973652e65752f7469746c652f63632d726573746974636865642e737667
2021-06-23 14:22:24 -07:00
Merith
f075eabc32
Merge pull request #66 from 3prm3-Org/readme
...
Fix curseforge svg, use new cc: restitched url
2021-06-22 19:44:41 -07:00
ƐqɿmƐ
3d1c9d1667
Fix curseforge svg, use new cc: restitched url
...
Make the curseforge svg visible rather than being a broken svg by switching to id
2021-06-22 19:33:03 -07:00
Merith
0028ad8f54
Merge pull request #64 from Toad-Dev/server-lang-fix
...
Fix getItemDetail() showing raw translation keys.
2021-06-17 09:37:44 -07:00
Merith
4c805f1c27
Make Edits proposed by SquidDev-CC ( #65 )
...
* Use toolchains as proposed by SquidDev-CC
* Removed jcenter() repo (where bad mercury dep was coming from)
Co-authored-by: ToadDev <748280+Toad-Dev@users.noreply.github.com>
2021-06-16 13:55:21 -07:00
hugeblank
505543ad94
Merge pull request #63 from hugeblank/fabric
...
Update InventoryMethods to handle Inventories explicitly, sent with the joint approval of toad-dev
2021-06-16 00:41:26 -07:00
ToadDev
644471c6bf
Fix getItemDetail showing raw translation keys.
...
The dedicated server always uses the default Language instance, as it's
setter method is stripped from the server jar. So if we mixin to this
instance's creation and load it with mods' en_us lang files, we will be
able to "translate" text on the server. Translate in quotes as we're
only loading en_us files, but mojang was the one who left out
translations on the dedicated server we shouldn't feel too bad.
2021-06-16 00:25:46 -07:00
hugeblank
bf87d7faa1
Update InventoryMethods to handle Inventories explicitly
2021-06-16 00:20:35 -07:00
Merith
be95b65488
Merge pull request #62 from 3prm3-Org/readme
...
Some readme tweaks and fixes
2021-06-13 13:21:55 -07:00
ƐqɿmƐ
7e9f3bd61a
Some readme tweaks
...
1. "What is CC: Restiched" section now says I picked up maintaining the mod because the team working on Zundrel's fork can no longer mantain it so I picked it up to make it as equal as possible with CC:T.
2. Remove Bullet points next to images in "Conflicts" section
3.Add periods
4:Make CC: R/CC: T spacing more consistent
2021-06-13 13:14:17 -07:00
Merith
4a74aa8166
Change gitpod button, move banner to the top
2021-06-12 17:29:05 -07:00
ToadDev
b4ce4361ce
Merge pull request #60 from Toad-Dev/linter-fix
...
Linter fix and removing unnecessary this's
2021-06-12 16:11:04 -07:00
ToadDev
42a3dd24ad
Put some braces back
...
These blocks were not strictly needed but helped readability. I didn't
mean for the reformatter to change them while dealing with the "this"
problem. It also removed some braces in switch statements but who cares.
2021-06-12 15:51:47 -07:00
ToadDev
9129da2e3d
What is this?
...
This's -> gone
2021-06-12 15:51:45 -07:00
ToadDev
668cdcdd39
Fix linter.. maybe
2021-06-12 15:48:09 -07:00
ToadDev
2543ebee10
Fix checkstyle
2021-06-12 15:46:33 -07:00
hugeblank
104a317163
Gui fixes
...
- Makes GuiTurtle extend from GuiComputer
- Fixes #51
- Fixes grayed background surrounding interface not rendering for computers
2021-06-12 13:42:28 -07:00
Merith
921802e6c9
Merge pull request #59 from 3prm3-Org/readme
...
Make images function on readme and make the logo a monitor (again)
2021-06-11 11:24:35 -07:00
ƐqɿmƐ
56cfc1a452
Fix the logo
...
Makes the logo look like a monitor (again)
2021-06-11 09:15:46 -07:00
ƐqɿmƐ
a14b98be22
Fix images on readme.md
...
Make the #Conficts images visible without having to click on a link to see them
2021-06-11 09:14:37 -07:00
Merith-TK
76b5c05acc
update changelog and whats new
2021-06-11 09:06:14 -07:00
Merith-TK
8b3f1a448f
Add Mod Conflicts
...
litterally just canvas and iris
2021-06-11 08:42:41 -07:00
Merith
3de515c617
Merge pull request #56 from Toad-Dev/monitor-fix
...
Some things that might improve the monitor rendering situation.
2021-06-11 07:41:36 -07:00
Merith
ab199cd9b0
Merge pull request #58 from Toad-Dev/tag-filler-fix
...
Fix #57
2021-06-11 06:45:57 -07:00
