xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,067 Commits 17 Branches 299 Tags
Commit Graph

4067 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
BallOfEnergy1
3d1ff54dd7 uh oh 2024-11-19 14:43:49 -06:00
BallOfEnergy1
53f20f67a0 Merge remote-tracking branch 'refs/remotes/upstream/master' into Optimization 
# Conflicts:
#	src/main/java/com/hbm/main/ModEventHandlerClient.java
#	src/main/java/com/hbm/main/ResourceManager.java
#	src/main/java/com/hbm/util/EntityDamageUtil.java
 2024-11-19 14:42:25 -06:00
Bob
98ed3fad91 more bolter crap, various fixes 2024-11-18 23:22:15 +01:00
Bob
86e5cd71ce imaginary technique: blunt force trauma 2024-11-17 20:10:30 +01:00
Bob
25b0f19fc7 localization 2024-11-16 22:57:17 +01:00
Bob
9e5724fc5f rather death do us part than shit do its fart 2024-11-16 20:55:43 +01:00
HbmMods
c7f73e2c1d
Merge pull request #1770 from Vaern/hbm 
hangman model + texture
 2024-11-16 20:54:36 +01:00
Vaern
813f7378bc hangman model + texture 2024-11-16 11:51:37 -08:00
Bob
d66b75b76c "i was in the war" congratulations, i'm gonna be in the next one and 
they have laser beams now
 2024-11-14 22:50:38 +01:00
Boblet
5e57c86f57 the incredibly impractical mechanism 2024-11-14 16:36:59 +01:00
Bob
ddcb554664 boilerplate crap so i can pretend like i was productive today 2024-11-13 19:09:47 +01:00
HbmMods
e95123c359
Merge pull request #1763 from MellowArpeggiation/master 
inspect, jammed, and dry fire animations for SPAS-12
 2024-11-13 08:07:56 +01:00
George Paton
586d71911b add Steyr animations 2024-11-13 18:03:33 +11:00
George Paton
08a72afecc add audio to inspect and jammed SPAS-12 animations 2024-11-13 10:07:08 +11:00
Boblet
19bce7c342 explosive fucking buckshot from a peneumatic warhead yeeter 2024-11-12 16:24:31 +01:00
George Paton
26148a277d inspect, jammed, and dry fire animations for SPAS-12 2024-11-12 12:18:11 +11:00
Bob
6bd5c8577b finishing touches on the portable mass extinction machine 2024-11-11 21:23:23 +01:00
Boblet
062fe4205f legalize nuclear bombs 2024-11-11 16:46:46 +01:00
Bob
049bc8c31b go go gadget delete everything in this general area 2024-11-10 22:30:36 +01:00
BallOfEnergy
e3e306b24f small flixes 2024-11-09 23:33:50 -06:00
BallOfEnergy
6e39abcb1a oops, bugfixes! 
- Pooled buffers removed due to issues with releasing the memory.
- ExtProps fixed for players/entities; improper deserialization.
 2024-11-09 18:48:49 -06:00
BallOfEnergy
9409fba056 Merge remote-tracking branch 'upstream/master' into Optimization 
# Conflicts:
#	src/main/java/com/hbm/main/ResourceManager.java
 2024-11-09 17:09:17 -06:00
BallOfEnergy
0cc19a4ca4 Merge remote-tracking branch 'origin/Optimization' into Optimization 2024-11-09 17:05:09 -06:00
BallOfEnergy
4bd6f0df53 More shit, also precompiled packets. 
also holy shit the whitespace changes, intelliJ wanted to optimize the imports and refactored a ton of whitespace in the process.
 2024-11-09 17:04:19 -06:00
Bob
287569fe45 if you hold your foreskin shut while peeing you can do a charged shot 2024-11-09 22:53:29 +01:00
Boblet
cb14ffc638 shotshell recipes, some tweaks 2024-11-08 15:11:01 +01:00
Bob
7d88f73dc6 black powder effects 2024-11-07 22:00:56 +01:00
BallOfEnergy
d056a845e0
Merge branch 'HbmMods:master' into Optimization 2024-11-07 14:46:11 -06:00
Boblet
b9787fa08e the mechanism 2024-11-07 15:50:14 +01:00
Bob
4f60e44f8e let me just *removes entire barrel* 2024-11-06 22:16:39 +01:00
Boblet
e64a21ffd3 recipe crap 2024-11-06 16:37:34 +01:00
BallOfEnergy
88759fb504
Merge branch 'HbmMods:master' into Optimization 2024-11-05 17:53:19 -06:00
Bob
446f2f8c93 stg77 texture 2024-11-05 22:05:10 +01:00
BallOfEnergy
6516ff7aa2
Merge branch 'HbmMods:master' into Optimization 2024-11-05 14:12:38 -06:00
Boblet
1e37d14de2 delete .metadata they said, it'll fix caching issues they said 2024-11-05 16:07:53 +01:00
BallOfEnergy
970485f68c there's actually so many optimizations here that it'd be impossible for be to explain them all 2024-11-04 21:34:48 -06:00
BallOfEnergy
354860c610
Merge branch 'HbmMods:master' into Optimization 2024-11-04 21:17:12 -06:00
Bob
9319fa4088 STG77 2024-11-04 22:13:10 +01:00
Boblet
e6bbd63267 ow 2024-11-04 16:59:46 +01:00
HbmMods
4e82346c5a
Merge pull request #1755 from abel1502/abel-wings 
Forgot to remove debug logging
 2024-11-03 22:35:55 +01:00
abel1502
7833af674f
Remove debug log spam 2024-11-04 00:34:11 +03:00
Bob
4aea1af8b5 there are spiders under my skin 2024-11-03 21:32:07 +01:00
HbmMods
98193d8e3c
Merge pull request #1753 from abel1502/abel-wings 
Jetpack-like wings
 2024-11-03 12:08:55 +01:00
Bob
40d5c05b64 :painB: 2024-11-02 23:45:29 +01:00
BallOfEnergy
02e9219b2e Merge remote-tracking branch 'upstream/master' into Optimization 
# Conflicts:
#	src/main/java/com/hbm/extprop/HbmLivingProps.java
#	src/main/java/com/hbm/handler/EntityEffectHandler.java
 2024-11-02 15:58:54 -05:00
abel1502
b58ab4520b
Fix wings rendering 2024-11-02 23:44:45 +03:00
abel1502
d39c66ded4
Extend jetpack features to wings 2024-11-02 23:10:58 +03:00
HbmMods
b6f29739a1
Merge pull request #1749 from WolfEclipses/master 
German Localization Fixes
 2024-11-02 14:20:36 +01:00
HbmMods
8be3cd4943
Merge pull request #1751 from abel1502/abel-take-euphy-home 
Allow collecting Euphy's statue with a red key
 2024-11-02 14:19:09 +01:00
HbmMods
f21d9230f5
Merge pull request #1752 from abel1502/abel-typo-1 
Fix some typos
 2024-11-02 14:18:10 +01:00