Commit Graph

4019 Commits

Author SHA1 Message Date
e4a7ca35f7
Localization for items 2021-09-02 14:03:26 +07:00
107c1e2ed2
More matter capacitors 2021-09-02 13:57:33 +07:00
16259a5d7e
Damage for twice of player's max health instead when becoming android 2021-09-02 00:14:54 +07:00
b3330a2f1f
Some crafting ingredients and first recipes 2021-09-01 20:31:50 +07:00
167490382c
Actually hurt the player 2021-09-01 16:30:06 +07:00
288336ae18
Merge remote-tracking branch 'origin/master' into master 2021-09-01 16:26:22 +07:00
9d13db4298
Drive viewer "drive" blockstate property 2021-09-01 16:25:32 +07:00
ccadc1647f drive viewer blockstate models 2021-09-01 00:05:05 +06:00
079b0d8dcf
fix generator for semi worker blockstates 2021-08-31 22:21:05 +07:00
4f8aaaa019
Merge branch 'master' of gitlab.com:DBotThePony/overdrive-that-matters into master 2021-08-31 19:45:20 +07:00
4aef68fed6
Ignore auto generated file 2021-08-31 19:44:30 +07:00
f0fa1a2d35
Remove auto generated file 2021-08-31 19:44:02 +07:00
387111ee64
Drive viewer working state and power consumption 2021-08-31 19:42:05 +07:00
c101edaee4
Black hole improvements 2021-08-30 21:28:55 +07:00
f9fb9124b7
Black hole renderer 2021-08-30 20:00:07 +07:00
a30e6dcb9b Added an "error" model for Matter decomposer, it's basically a copy of idle model because decomposer's blockstate keeps resetting after every build and changing both idle and error to idle model won't work. 2021-08-30 15:26:31 +06:00
2573a82559 Brain fart 2021-08-30 13:50:20 +06:00
03afe7baad
Move render helpers to render package 2021-08-30 11:50:14 +07:00
af828c1296
Move screen package to client package 2021-08-30 10:50:09 +07:00
b304a5f12a
Some tweaks to black hole 2021-08-30 10:42:41 +07:00
fde2ab46ee
Remove auto generated files 2021-08-30 10:26:24 +07:00
7af10649ef
Merge remote-tracking branch 'remotes/origin/master' into master 2021-08-30 10:25:05 +07:00
8fe2d8daa8
Black holes 2021-08-30 10:22:58 +07:00
bf49fc030d Added a model for matter bottler.
Added models for condensation drives.
Added a model for drive viewer.
Added container block textures.
Added Tritanium block textures.
Added item names to container blocks.
Changed Creative matter capacitor to look more like creative battery.
2021-08-30 04:41:19 +06:00
ac7bcc0f75
Add gitkeeps 2021-08-29 20:02:01 +07:00
a7ed5d8dae
Also generate models 2021-08-29 19:56:28 +07:00
1a9c86a1f0
Auto generate blockstates for basic blocks 2021-08-29 19:53:09 +07:00
9ecbad9f48
Make crates mineable 2021-08-29 19:35:36 +07:00
c614509ad6
Ignore generated files 2021-08-29 19:23:24 +07:00
baa789b77a
More building blocks 2021-08-29 19:22:59 +07:00
a246cf5e25
Add crates? 2021-08-29 18:54:41 +07:00
300c27d366
Split worker class 2021-08-29 18:27:20 +07:00
651ba41da7
Add matter bottler blockstate 2021-08-29 18:17:37 +07:00
26a1388c3d
Add working state to bottler 2021-08-29 18:14:08 +07:00
a85ee9fb98
Ignore generated assets 2021-08-29 18:13:59 +07:00
a5fe020564
Merge remote-tracking branch 'origin/master' into master 2021-08-29 17:02:34 +07:00
a02c7360fa
Add drops for matter bottler and drive viewer 2021-08-29 17:02:10 +07:00
3506e661b1
Add second variant of condensation drive 2021-08-29 16:49:02 +07:00
1a4c1b468a
Fix quick move duping everything 2021-08-29 16:38:07 +07:00
b3b1a03136
Filter of autopickup for condensation drive 2021-08-29 16:30:34 +07:00
f1f1ce897c
Implement clone in drive menu 2021-08-28 15:23:44 +07:00
b0e9a96e50
Reasonable interaction with drive viewer 2021-08-28 14:47:01 +07:00
fa72e6ec03
Working interaction with drives 2021-08-28 10:12:13 +07:00
de22ab54c0
More test code regarding drives 2021-08-27 18:53:25 +07:00
998ce95f1c
Change back id to being UUIDs 2021-08-27 14:33:36 +07:00
05bed3a737
Drive viewer test code 2021-08-27 13:16:54 +07:00
2166119a75
Improve drive testcode 2021-08-26 10:41:48 +07:00
e7e12bed8c
Condensation drive test 2021-08-25 22:53:17 +07:00
76de8549aa fixed an error in matter decomposer's model, again. 2021-08-25 02:42:23 +06:00
1650e63e20 Merge branch 'master' of https://gitlab.com/DBotThePony/overdrive-that-matters 2021-08-24 21:42:25 +06:00