-
Notifications
You must be signed in to change notification settings - Fork 176
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
GTOS stuff #115
Merged
Merged
GTOS stuff #115
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
support TESR, lighting fix, multi layer hook
* spawn terminal for new players * gen guide files from resources * simplified App framework * backgroud app bug fix * hw system * hw capability * fix capability * fix file seystem * fix capitalization on terminal icon folders (#125) * terminal root path Co-authored-by: froot <66188216+kumquat-ir@users.noreply.github.com>
commit 8c662d8 Author: DStrand1 <dane@strandboge.com> Date: Sat Sep 4 02:39:40 2021 -0500 add emissive support to `SimpleOrientedCubeRenderer` commit 8b57bfb Author: DStrand1 <dane@strandboge.com> Date: Sat Sep 4 02:30:43 2021 -0500 last few textures commit d0d14c6 Author: DStrand1 <dane@strandboge.com> Date: Sat Sep 4 01:52:45 2021 -0500 clean up some loose ends for emissive textures commit 905cbcb Author: DStrand1 <dane@strandboge.com> Date: Sat Sep 4 01:14:46 2021 -0500 reorganize client configs a bit commit fb6b042 Author: DStrand1 <dane@strandboge.com> Date: Sat Sep 4 01:08:49 2021 -0500 add config for emissive textures (default true) commit 1a75afb Author: DStrand1 <dane@strandboge.com> Date: Sat Sep 4 00:41:00 2021 -0500 finish `OrientedOverlayRenderer`s commit 17e880a Author: DStrand1 <dane@strandboge.com> Date: Sat Sep 4 00:32:23 2021 -0500 use Pulverizer texture for HV+ macerators commit 312fb13 Author: DStrand1 <dane@strandboge.com> Date: Sat Sep 4 00:32:07 2021 -0500 finish rest of `blocks/machines/` commit 2014536 Author: DStrand1 <dane@strandboge.com> Date: Fri Sep 3 23:05:38 2021 -0500 start adding machine emissive textures commit 1f02279 Author: DStrand1 <dane@strandboge.com> Date: Fri Sep 3 23:05:23 2021 -0500 fix some rendering issues commit 96224cb Author: DStrand1 <dane@strandboge.com> Date: Fri Sep 3 21:45:06 2021 -0500 emissive textures for multiblocks commit b6a09ed Author: DStrand1 <dane@strandboge.com> Date: Fri Sep 3 21:38:53 2021 -0500 move emissive code to OrientedOverlayRenderer
Great stuff! I didn't review the code, but i tested it. |
brachy84
approved these changes
Sep 4, 2021
commit d062cdc Author: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Thu Sep 16 20:07:28 2021 -0700 Fix simple_washer spam (#154) commit 909186a Author: DStrand1 <dane@strandboge.com> Date: Thu Sep 16 21:38:03 2021 -0500 reorganize registries commit 5ba4f44 Author: DStrand1 <dane@strandboge.com> Date: Thu Sep 16 20:30:22 2021 -0500 keybind related cleanups commit ca2f2a3 Author: Dane Strandboge <dane@strandboge.com> Date: Thu Sep 16 18:28:22 2021 -0500 Multi-Fluid Hatches (#141) commit eb4eb2f Author: TechLord22 <37029404+TechLord22@users.noreply.github.com> Date: Thu Sep 16 18:43:17 2021 -0400 Allow CT to add flags to existing materials (#150) commit 152c268 Author: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Thu Sep 16 15:40:05 2021 -0700 Some config changes (#153) commit 2f08065 Author: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Wed Sep 15 18:04:39 2021 -0700 Many Small Cleanups (#152) commit 24f493d Author: froot <66188216+kumquat-ir@users.noreply.github.com> Date: Wed Sep 15 18:02:27 2021 -0700 ingot -> wireFine (#151) commit 1131763 Author: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Wed Sep 15 12:55:03 2021 -0700 Slight Cleanup for armor event logic (#148) * Slight Cleanup for armor event logic * Some null checking to silence some warnings commit 222b14a Author: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Wed Sep 15 12:48:11 2021 -0700 Cleanup unused imports (#149) commit 2b88fa6 Author: DStrand1 <dane@strandboge.com> Date: Sun Sep 12 15:03:28 2021 -0500 fix multi overclocking commit c385137 Author: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Sun Sep 12 11:43:34 2021 -0700 Slight nerf to Multismelter rates (#144) commit 3de8c81 Author: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Fri Sep 10 17:49:02 2021 -0700 Clean up more legacy NBT (#143) commit 3d4921e Author: TechLord22 <swarren2022@gmail.com> Date: Fri Sep 10 20:47:33 2021 -0400 remove FieldsAreNonnullByDefault.java commit e8fc713 Author: DStrand1 <dane@strandboge.com> Date: Wed Sep 8 21:26:34 2021 -0500 clean up world accelerator NBT commit a20d8c9 Author: DStrand1 <dane@strandboge.com> Date: Wed Sep 8 21:20:08 2021 -0500 port World Accelerators from Gregicality commit 50fded2 Author: DStrand1 <dane@strandboge.com> Date: Wed Sep 8 20:59:55 2021 -0500 fix a couple of advancements from last commit commit 55b58eb Author: DStrand1 <dane@strandboge.com> Date: Wed Sep 8 20:58:12 2021 -0500 rearrange MTEs a bit for better JEI order commit d3baab2 Author: DStrand1 <dane@strandboge.com> Date: Wed Sep 8 20:09:17 2021 -0500 fix a bad test case call commit fa916cb Author: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Wed Sep 8 18:08:25 2021 -0700 Implement Distinct Buses (#124) Co-authored-by: PrototypeTrousers <salomaoo@gmail.com> commit baa8059 Author: PrototypeTrousers <salomaoo@gmail.com> Date: Wed Sep 8 20:58:00 2021 -0300 Faster Recipe Matching (#116) commit 52a61b1 Author: Synthitic <brianbosseyt@gmail.com> Date: Tue Sep 7 22:39:56 2021 -0500 Fix separate multi dimensions in worldgen jsons (#110) commit 27480a1 Author: DStrand1 <dane@strandboge.com> Date: Tue Sep 7 22:36:28 2021 -0500 update changelog for last few weeks commit c52a653 Author: BraggestSage833 <46819052+BraggestSage833@users.noreply.github.com> Date: Tue Sep 7 22:00:45 2021 -0400 Add Hammering Enchant (#113) commit aff3803 Author: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Tue Sep 7 18:42:34 2021 -0700 Fix Fluid Regulator Keep Exact mode (#138) commit 7f3c8c4 Author: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Tue Sep 7 18:41:34 2021 -0700 Add the Rotor Extruder Shape (#139) commit cd26e72 Author: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Tue Sep 7 18:26:25 2021 -0700 Initial parallel recipe logic helper (#134) commit c25044f Author: DStrand1 <dane@strandboge.com> Date: Tue Sep 7 19:52:24 2021 -0500 remove Polystyrene, Polysiloxane commit f3db325 Author: TechLord22 <swarren2022@gmail.com> Date: Tue Sep 7 15:37:57 2021 -0400 add more efficient coke brick recipe commit e732cce Author: TechLord22 <swarren2022@gmail.com> Date: Tue Sep 7 12:01:06 2021 -0400 brick related recipe changes commit c8fa004 Author: TechLord22 <swarren2022@gmail.com> Date: Tue Sep 7 09:45:41 2021 -0400 better fisher tooltip commit 3771afa Author: DStrand1 <dane@strandboge.com> Date: Mon Sep 6 20:45:53 2021 -0500 add reserved ranges, tweak loot tables commit c3cdf2e Author: DStrand1 <dane@strandboge.com> Date: Mon Sep 6 18:28:35 2021 -0500 misc fixes commit 3b90ff3 Author: DStrand1 <dane@strandboge.com> Date: Mon Sep 6 18:00:12 2021 -0500 allow Drums to drain fluids down (from GT6) commit 3767821 Author: DStrand1 <dane@strandboge.com> Date: Sun Sep 5 19:42:58 2021 -0500 add some missed CT material stuff commit d088a7f Author: DStrand1 <dane@strandboge.com> Date: Sun Sep 5 17:56:29 2021 -0500 finish property adders commit e58500b Author: DStrand1 <dane@strandboge.com> Date: Sun Sep 5 17:34:04 2021 -0500 finish CTMaterialBuilder commit f281385 Author: DStrand1 <dane@strandboge.com> Date: Sun Sep 5 16:54:24 2021 -0500 finalize java materials before CT runs commit 3fde4eb Author: TechLord22 <swarren2022@gmail.com> Date: Sun Sep 5 17:49:50 2021 -0400 remove duplicate recipe and bad sulfuric acid recipe (again) commit 74c1c43 Author: DStrand1 <dane@strandboge.com> Date: Sat Sep 4 21:27:36 2021 -0500 start work on CT material appenders commit 3247af2 Author: DStrand1 <dane@strandboge.com> Date: Sat Sep 4 20:13:12 2021 -0500 most work on first ZenExpansion commit be1cab6 Author: DStrand1 <dane@strandboge.com> Date: Sat Sep 4 19:03:44 2021 -0500 remove old CT file commit 561c32a Author: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Sat Sep 4 17:00:24 2021 -0700 Rename the MultiFurnace to the MultiSmelter (#135) commit e5c0e25 Author: DStrand1 <dane@strandboge.com> Date: Sat Sep 4 19:00:02 2021 -0500 first pass at CT-facing Material Builder commit 605ed5e Author: DStrand1 <dane@strandboge.com> Date: Sat Sep 4 17:59:14 2021 -0500 rewrite LighterBehavior, maybe fix lag? commit a8f6cf2 Author: Synthitic <brianbosseyt@gmail.com> Date: Sat Sep 4 17:50:45 2021 -0500 Add solar covers MV-UV (#111) commit 28e8dc1 Author: BraggestSage833 <46819052+BraggestSage833@users.noreply.github.com> Date: Sat Sep 4 18:31:59 2021 -0400 Port over Gregicality Armor (#96) commit 0af3156 Author: TechLord22 <swarren2022@gmail.com> Date: Sat Sep 4 13:27:10 2021 -0400 emissive texture improvements and fixes
commit d062cdc Author: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Thu Sep 16 20:07:28 2021 -0700 Fix simple_washer spam (#154) commit 909186a Author: DStrand1 <dane@strandboge.com> Date: Thu Sep 16 21:38:03 2021 -0500 reorganize registries commit 5ba4f44 Author: DStrand1 <dane@strandboge.com> Date: Thu Sep 16 20:30:22 2021 -0500 keybind related cleanups commit ca2f2a3 Author: Dane Strandboge <dane@strandboge.com> Date: Thu Sep 16 18:28:22 2021 -0500 Multi-Fluid Hatches (#141) commit eb4eb2f Author: TechLord22 <37029404+TechLord22@users.noreply.github.com> Date: Thu Sep 16 18:43:17 2021 -0400 Allow CT to add flags to existing materials (#150) commit 152c268 Author: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Thu Sep 16 15:40:05 2021 -0700 Some config changes (#153) commit 2f08065 Author: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Wed Sep 15 18:04:39 2021 -0700 Many Small Cleanups (#152) commit 24f493d Author: froot <66188216+kumquat-ir@users.noreply.github.com> Date: Wed Sep 15 18:02:27 2021 -0700 ingot -> wireFine (#151) commit 1131763 Author: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Wed Sep 15 12:55:03 2021 -0700 Slight Cleanup for armor event logic (#148) * Slight Cleanup for armor event logic * Some null checking to silence some warnings commit 222b14a Author: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Wed Sep 15 12:48:11 2021 -0700 Cleanup unused imports (#149) commit 2b88fa6 Author: DStrand1 <dane@strandboge.com> Date: Sun Sep 12 15:03:28 2021 -0500 fix multi overclocking commit c385137 Author: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Sun Sep 12 11:43:34 2021 -0700 Slight nerf to Multismelter rates (#144) commit 3de8c81 Author: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Fri Sep 10 17:49:02 2021 -0700 Clean up more legacy NBT (#143) commit 3d4921e Author: TechLord22 <swarren2022@gmail.com> Date: Fri Sep 10 20:47:33 2021 -0400 remove FieldsAreNonnullByDefault.java commit e8fc713 Author: DStrand1 <dane@strandboge.com> Date: Wed Sep 8 21:26:34 2021 -0500 clean up world accelerator NBT commit a20d8c9 Author: DStrand1 <dane@strandboge.com> Date: Wed Sep 8 21:20:08 2021 -0500 port World Accelerators from Gregicality commit 50fded2 Author: DStrand1 <dane@strandboge.com> Date: Wed Sep 8 20:59:55 2021 -0500 fix a couple of advancements from last commit commit 55b58eb Author: DStrand1 <dane@strandboge.com> Date: Wed Sep 8 20:58:12 2021 -0500 rearrange MTEs a bit for better JEI order commit d3baab2 Author: DStrand1 <dane@strandboge.com> Date: Wed Sep 8 20:09:17 2021 -0500 fix a bad test case call commit fa916cb Author: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Wed Sep 8 18:08:25 2021 -0700 Implement Distinct Buses (#124) Co-authored-by: PrototypeTrousers <salomaoo@gmail.com> commit baa8059 Author: PrototypeTrousers <salomaoo@gmail.com> Date: Wed Sep 8 20:58:00 2021 -0300 Faster Recipe Matching (#116) commit 52a61b1 Author: Synthitic <brianbosseyt@gmail.com> Date: Tue Sep 7 22:39:56 2021 -0500 Fix separate multi dimensions in worldgen jsons (#110) commit 27480a1 Author: DStrand1 <dane@strandboge.com> Date: Tue Sep 7 22:36:28 2021 -0500 update changelog for last few weeks commit c52a653 Author: BraggestSage833 <46819052+BraggestSage833@users.noreply.github.com> Date: Tue Sep 7 22:00:45 2021 -0400 Add Hammering Enchant (#113) commit aff3803 Author: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Tue Sep 7 18:42:34 2021 -0700 Fix Fluid Regulator Keep Exact mode (#138) commit 7f3c8c4 Author: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Tue Sep 7 18:41:34 2021 -0700 Add the Rotor Extruder Shape (#139) commit cd26e72 Author: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Tue Sep 7 18:26:25 2021 -0700 Initial parallel recipe logic helper (#134) commit c25044f Author: DStrand1 <dane@strandboge.com> Date: Tue Sep 7 19:52:24 2021 -0500 remove Polystyrene, Polysiloxane commit f3db325 Author: TechLord22 <swarren2022@gmail.com> Date: Tue Sep 7 15:37:57 2021 -0400 add more efficient coke brick recipe commit e732cce Author: TechLord22 <swarren2022@gmail.com> Date: Tue Sep 7 12:01:06 2021 -0400 brick related recipe changes commit c8fa004 Author: TechLord22 <swarren2022@gmail.com> Date: Tue Sep 7 09:45:41 2021 -0400 better fisher tooltip commit 3771afa Author: DStrand1 <dane@strandboge.com> Date: Mon Sep 6 20:45:53 2021 -0500 add reserved ranges, tweak loot tables commit c3cdf2e Author: DStrand1 <dane@strandboge.com> Date: Mon Sep 6 18:28:35 2021 -0500 misc fixes commit 3b90ff3 Author: DStrand1 <dane@strandboge.com> Date: Mon Sep 6 18:00:12 2021 -0500 allow Drums to drain fluids down (from GT6) commit 3767821 Author: DStrand1 <dane@strandboge.com> Date: Sun Sep 5 19:42:58 2021 -0500 add some missed CT material stuff commit d088a7f Author: DStrand1 <dane@strandboge.com> Date: Sun Sep 5 17:56:29 2021 -0500 finish property adders commit e58500b Author: DStrand1 <dane@strandboge.com> Date: Sun Sep 5 17:34:04 2021 -0500 finish CTMaterialBuilder commit f281385 Author: DStrand1 <dane@strandboge.com> Date: Sun Sep 5 16:54:24 2021 -0500 finalize java materials before CT runs commit 3fde4eb Author: TechLord22 <swarren2022@gmail.com> Date: Sun Sep 5 17:49:50 2021 -0400 remove duplicate recipe and bad sulfuric acid recipe (again) commit 74c1c43 Author: DStrand1 <dane@strandboge.com> Date: Sat Sep 4 21:27:36 2021 -0500 start work on CT material appenders commit 3247af2 Author: DStrand1 <dane@strandboge.com> Date: Sat Sep 4 20:13:12 2021 -0500 most work on first ZenExpansion commit be1cab6 Author: DStrand1 <dane@strandboge.com> Date: Sat Sep 4 19:03:44 2021 -0500 remove old CT file commit 561c32a Author: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Sat Sep 4 17:00:24 2021 -0700 Rename the MultiFurnace to the MultiSmelter (#135) commit e5c0e25 Author: DStrand1 <dane@strandboge.com> Date: Sat Sep 4 19:00:02 2021 -0500 first pass at CT-facing Material Builder commit 605ed5e Author: DStrand1 <dane@strandboge.com> Date: Sat Sep 4 17:59:14 2021 -0500 rewrite LighterBehavior, maybe fix lag? commit a8f6cf2 Author: Synthitic <brianbosseyt@gmail.com> Date: Sat Sep 4 17:50:45 2021 -0500 Add solar covers MV-UV (#111) commit 28e8dc1 Author: BraggestSage833 <46819052+BraggestSage833@users.noreply.github.com> Date: Sat Sep 4 18:31:59 2021 -0400 Port over Gregicality Armor (#96) commit 0af3156 Author: TechLord22 <swarren2022@gmail.com> Date: Sat Sep 4 13:27:10 2021 -0400 emissive texture improvements and fixes Merge branch 'master' into app_console
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A new app for configuring GT machines. It is very convenient to configure any supported facing of the machine/multi-block.
Supported content:
Additional content:
Changes: