mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-08-29 16:47:56 +00:00
Code Issues Releases Wiki Activity
2,344 Commits 22 Branches 252 Tags
883ac717d83f7c626fc2548e4c5e41a8a64b6e0c
Commit Graph

2344 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan Coates
045472577a Improve motd a hundred fold 
Yes, I know this is a terrible feature. But it's been a long week and
I'm so tired.

Also fix the ordering in motd_spec. Who thought putting the month first
was reasonable?
 2021-10-08 20:49:37 +01:00
Nikita Savyolov
a7a9f4fa13 license: imatrix4f 2021-10-08 18:42:29 +03:00
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
JackMacWindows
9f539dbd59 Add about program for easier version identification (#936) 2021-10-08 11:29:52 +01:00
Jonathan Coates
ca367e7cc7 Don't run client tests on CI 
Kinda sucks, but they're so inconsistent between platforms right now,
and I cannot be bothered to get CI working. It only needs to work on my
machine.
 2021-10-07 11:51:18 +01:00
Weblate
f6fd0ad172 Translations for Russian (ru_ru) 
Translations for French

Translations for English

Co-authored-by: SquidDev <git@squiddev.cc>
 2021-10-07 10:25:23 +00:00
Nikita Savyolov
11272b8d00 style: some spaces and imports 2021-10-07 00:25:18 +03:00
Jonathan Coates
0d35331b82 Default to Java 16 in the gitpod environment 2021-10-06 18:52:36 +01:00
Jonathan Coates
076b454c8f Also convert the turtle model key to a record 2021-10-06 18:40:33 +01:00
Jonathan Coates
36e0dcbad0 Change network packet to a record 
Look at all that code we can delete!
 2021-10-06 18:38:51 +01:00
Jonathan Coates
0b5fe990e5 Bump Forge version 
- Clean up NBT constants, replace with built-in ones
 - Switch over to the new capability system
 2021-10-06 18:28:28 +01:00
Jonathan Coates
29ece2a6e3 Don't run client tests on CI 
Kinda sucks, but they're so inconsistent between platforms right now,
and I cannot be bothered to get CI working. It only needs to work on my
machine.
 2021-10-06 18:23:38 +01:00
Jonathan Coates
eba26dedab Merge branch 'mc-1.16.x' into mc-1.17.x 2021-10-06 18:10:45 +01:00
Nikita Savyolov
1c254e3bb0 style: some spaces 2021-10-06 19:13:49 +03:00
Weblate
13779d6ad3 Translations for French 
Translations for German

Co-authored-by: SquidDev <bonzoweb@hotmail.co.uk>
 2021-10-06 16:09:38 +00: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
Jonathan Coates
d700f1f500 Bump the image comparison threshold again 
Not sure what the right long-term solution is here. An alternative image
comparison? Take multiple screenshots?
 2021-10-03 11:21:37 +01:00
i develop things
06bf84f151 Make color arguments to term.blit case-insensitive (#929) 2021-10-03 11:11:31 +01: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
Jonathan Coates
8ba20985d7 Store additional state in WiredModemPeripheral 
This means wired peripherals now correctly track their current mounts
and attached state, rather than inheriting from the origin wired modem.

Closes #890
 2021-09-27 22:18:32 +01:00
JackMacWindows
7bb7b5e638 Make Rednet deduplication more efficient (#925) 2021-09-26 21:15:37 +01:00
Alessandro
297426419b Fix computer IDs greater than 65535 crashing Rednet (#900) 2021-09-26 17:13:26 +01:00
Jonathan Coates
eb61c5c5d7 Add a overly-complex test harness for rednet 
Allows us to run multiple "computers" in parallel and send messages
betwene them. I don't think this counts as another test framework, but
it's sure silly.
 2021-09-26 16:45:23 +01:00
Jonathan Coates
cf2bc667c1 Add more tests for monitor and printout rendering 2021-09-26 11:10:41 +01:00
Jonathan Coates
c8449086ee Optimise CC:T logo 2021-09-26 10:26:42 +01:00
Jonathan Coates
662bead8be Several fixes and improvements for client tests 
- Fix broken /cctest marker
 - Correctly wait for the screenshot to be taken before continuing.
 - Filter out client tests in a different place, meaning we can remove
   the /cctest runall command
 - Bump kotlin version
 2021-09-26 09:48:58 +01:00
Jonathan Coates
acaa61a720 Make the monitor depth blocker slightly larger 2021-09-25 16:46:37 +01: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
Jonathan Coates
5facbca2b3 Merge pull request #927 from MCJack123/patch-8 
Added binary flag to websocket_message docs
 2021-09-23 20:34:21 +01:00
JackMacWindows
6c6b2c2ff3 Added binary flag to websocket_message docs 2021-09-23 15:20:19 -04:00
Jonathan Coates
3eb601e554 Pass lightmap variables around various renderers 
- Add lightmap parameters to the text, computer and printout renderers.

 - Printouts are always rendered using the current lightmap. When
   interacting with the GUI, we use the fullbright lightmap coordinate.

 - Pocket computers render their border using the lightmap. Terminal and
   light do not use the lightmap at all.

There's some funkiness going on here with render types - it appears the
"correct" position_color_tex_lightmap render type is actually one used
for text.

Fixes #919. This bug does occur on 1.16 too, but given how complex the
rendering changes are between 1.16 and 1.17 I do /not/ want to have to
implement this twice. Sorry.
 2021-09-19 15:49:31 +01:00
Jonathan Coates
d0e79f310e Bump Forge version 
Not much has changed, just some cleanup.
 2021-09-19 11:57:37 +01:00